GNU C Library master sources branch master updated. glibc-2.19-787-ge35c53e

[siddhesh at sourceware dot org]

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  e35c53e397e7abbd41fedacdedcfa5af7b5c2c52 (commit)
       via  80b5c505889ac4747aab54614d2bce18efa511ea (commit)
      from  27b75f56c92b82fe335ae8b5365095854086894f (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://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=e35c53e397e7abbd41fedacdedcfa5af7b5c2c52

commit e35c53e397e7abbd41fedacdedcfa5af7b5c2c52
Author: Siddhesh Poyarekar <siddhesh@redhat.com>
Date:   Tue Jul 8 16:40:24 2014 +0530

    Check value at resplen2 if it is not NULL
    
    There was a typo in the previous patch due to which resplen2 was
    checked for non-zero instead of the value at resplen2.  Fix that and
    improve the condition by checking resplen2 for non-NULL (instead of
    answerp2) and also adding the check in a third place.

diff --git a/ChangeLog b/ChangeLog
index 79d80c0..5892add 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2014-07-08  Siddhesh Poyarekar  <siddhesh@redhat.com>
 
+	* resolv/res_query.c (__libc_res_nsearch): Dereference resplen2
+	after checking that it is non-NULL.
+
 	* sysdeps/i386/dl-machine.h: Define ELF_MACHINE_NO_REL.
 
 2014-07-08  Adhemerval Zanella  <azanella@linux.vnet.ibm.com>
diff --git a/resolv/res_query.c b/resolv/res_query.c
index 4e6612c..e4ee2a6 100644
--- a/resolv/res_query.c
+++ b/resolv/res_query.c
@@ -384,7 +384,7 @@ __libc_res_nsearch(res_state statp,
 					      answerp2_malloced);
 		if (ret > 0 || trailing_dot
 		    /* If the second response is valid then we use that.  */
-		    || (ret == 0 && answerp2 != NULL && resplen2 > 0))
+		    || (ret == 0 && resplen2 != NULL && *resplen2 > 0))
 			return (ret);
 		saved_herrno = h_errno;
 		tried_as_is++;
@@ -424,8 +424,8 @@ __libc_res_nsearch(res_state statp,
 						      answer, anslen, answerp,
 						      answerp2, nanswerp2,
 						      resplen2, answerp2_malloced);
-			if (ret > 0 || (ret == 0 && answerp2 != NULL
-					&& resplen2 > 0))
+			if (ret > 0 || (ret == 0 && resplen2 != NULL
+					&& *resplen2 > 0))
 				return (ret);
 
 			if (answerp && *answerp != answer) {
@@ -494,7 +494,8 @@ __libc_res_nsearch(res_state statp,
 					      answer, anslen, answerp,
 					      answerp2, nanswerp2, resplen2,
 					      answerp2_malloced);
-		if (ret > 0)
+		if (ret > 0 || (ret == 0 && resplen2 != NULL
+				&& *resplen2 > 0))
 			return (ret);
 	}
 

http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=80b5c505889ac4747aab54614d2bce18efa511ea

commit 80b5c505889ac4747aab54614d2bce18efa511ea
Author: Siddhesh Poyarekar <siddhesh@redhat.com>
Date:   Tue Jul 8 16:19:55 2014 +0530

    Fix Wundef warning for ELF_MACHINE_NO_REL on i386

diff --git a/ChangeLog b/ChangeLog
index 1c7e41d..79d80c0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-07-08  Siddhesh Poyarekar  <siddhesh@redhat.com>
+
+	* sysdeps/i386/dl-machine.h: Define ELF_MACHINE_NO_REL.
+
 2014-07-08  Adhemerval Zanella  <azanella@linux.vnet.ibm.com>
 
 	* sysdeps/powerpc/memmove.c: Remove file.
diff --git a/sysdeps/i386/dl-machine.h b/sysdeps/i386/dl-machine.h
index 368bee2..a3a632c 100644
--- a/sysdeps/i386/dl-machine.h
+++ b/sysdeps/i386/dl-machine.h
@@ -292,6 +292,7 @@ elf_machine_plt_value (struct link_map *map, const Elf32_Rel *reloc,
 /* The i386 never uses Elf32_Rela relocations for the dynamic linker.
    Prelinked libraries may use Elf32_Rela though.  */
 #define ELF_MACHINE_NO_RELA defined RTLD_BOOTSTRAP
+#define ELF_MACHINE_NO_REL 0
 
 #ifdef RESOLVE_MAP
 

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

Summary of changes:
 ChangeLog                 |    7 +++++++
 resolv/res_query.c        |    9 +++++----
 sysdeps/i386/dl-machine.h |    1 +
 3 files changed, 13 insertions(+), 4 deletions(-)


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