This is the mail archive of the glibc-cvs@sourceware.org mailing list for the glibc project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

GNU C Library master sources branch, master, updated. glibc-2.10-161-g09f97a8


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, master has been updated
       via  09f97a8fbf8be28cc489a7baa1bead17e2cbf764 (commit)
       via  1c0ab5bd34159d2ae53390571113844ebadc161b (commit)
      from  137028b4d7e50f71906c1656c27079eac5a1d085 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=09f97a8fbf8be28cc489a7baa1bead17e2cbf764

commit 09f97a8fbf8be28cc489a7baa1bead17e2cbf764
Author: Ulrich Drepper <drepper@redhat.com>
Date:   Fri Jul 17 05:58:12 2009 -0700

    Add missing BZ number in ChangeLog.

diff --git a/ChangeLog b/ChangeLog
index 7dab061..6418f86 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,7 @@
 
 2009-07-16  Petr Baudis  <pasky@suse.cz>
 
+	[BZ #10402]
 	* nscd/mem.c (mempool_alloc): Fix unlock missing in the else branch.
 	* nscd/aicache.c: Remove bogus db->lock unlock.
 	* nscd/grpcache.c: Likewise.

http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=1c0ab5bd34159d2ae53390571113844ebadc161b

commit 1c0ab5bd34159d2ae53390571113844ebadc161b
Author: Ulrich Drepper <drepper@redhat.com>
Date:   Thu Jul 16 23:37:50 2009 -0700

    Handle overly large answer buffers in resolver.
    
    In EDNS0 records the maximum result size is transmitted in a 16
    bit value.  Large buffer sizes were handled incorrectly by using
    only the low 16 bits.  Fix this by limiting the size to 0xffff.

diff --git a/ChangeLog b/ChangeLog
index 37f20a4..7dab061 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-07-16  Ulrich Drepper  <drepper@redhat.com>
+
+	[BZ #10360]
+	* resolv/res-mkquery.c (__res_nopt): If anslen is > 0xffff store
+	0xffff in the EDNS0 record.
+
 2009-07-16  Petr Baudis  <pasky@suse.cz>
 
 	* nscd/mem.c (mempool_alloc): Fix unlock missing in the else branch.
diff --git a/resolv/res_mkquery.c b/resolv/res_mkquery.c
index ae0cdb4..2dda4c0 100644
--- a/resolv/res_mkquery.c
+++ b/resolv/res_mkquery.c
@@ -244,7 +244,7 @@ __res_nopt(res_state statp,
 	*cp++ = 0;	/* "." */
 
 	NS_PUT16(T_OPT, cp);	/* TYPE */
-	NS_PUT16(anslen & 0xffff, cp);	/* CLASS = UDP payload size */
+	NS_PUT16(MIN(anslen, 0xffff), cp);	/* CLASS = UDP payload size */
 	*cp++ = NOERROR;	/* extended RCODE */
 	*cp++ = 0;		/* EDNS version */
 	/* XXX Once we support DNSSEC we change the flag value here.  */

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog            |    7 +++++++
 resolv/res_mkquery.c |    2 +-
 2 files changed, 8 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
GNU C Library master sources


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]