This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch master updated. glibc-2.26-59-g3016149
- From: fw at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 9 Aug 2017 15:47:36 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.26-59-g3016149
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 3016149819268b14660f791b971910ccc2cc13e5 (commit)
from 756d1699896e62445196c3137a982a990a8e8847 (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=3016149819268b14660f791b971910ccc2cc13e5
commit 3016149819268b14660f791b971910ccc2cc13e5
Author: Florian Weimer <fweimer@redhat.com>
Date: Wed Aug 9 17:46:04 2017 +0200
nss: Call __resolv_context_put before early return in get*_r [BZ #21932]
This corrects an oversight introduced in commit
352f4ff9a268b81ef5d4b2413f582565806e4790 (resolv: Introduce struct
resolv_context).
diff --git a/ChangeLog b/ChangeLog
index f0c5eba..3c20531 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2017-08-09 Florian Weimer <fweimer@redhat.com>
+
+ [BZ #21932]
+ * nss/getXXbyYY_r.c (REENTRANT_NAME): Call __resolv_context_put
+ before early return.
+
2017-08-09 Andreas Schwab <schwab@suse.de>
[BZ #21041]
diff --git a/nss/getXXbyYY_r.c b/nss/getXXbyYY_r.c
index 6c547ea..bce80e0 100644
--- a/nss/getXXbyYY_r.c
+++ b/nss/getXXbyYY_r.c
@@ -234,6 +234,9 @@ INTERNAL (REENTRANT_NAME) (ADD_PARAMS, LOOKUP_TYPE *resbuf, char *buffer,
H_ERRNO_VAR_P))
{
case -1:
+# ifdef NEED__RES
+ __resolv_context_put (res_ctx);
+# endif
return errno;
case 1:
#ifdef NEED_H_ERRNO
@@ -253,7 +256,12 @@ INTERNAL (REENTRANT_NAME) (ADD_PARAMS, LOOKUP_TYPE *resbuf, char *buffer,
nscd_status = NSCD_NAME (ADD_VARIABLES, resbuf, buffer, buflen, result
H_ERRNO_VAR);
if (nscd_status >= 0)
- return nscd_status;
+ {
+# ifdef NEED__RES
+ __resolv_context_put (res_ctx);
+# endif
+ return nscd_status;
+ }
}
#endif
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 6 ++++++
nss/getXXbyYY_r.c | 10 +++++++++-
2 files changed, 15 insertions(+), 1 deletions(-)
hooks/post-receive
--
GNU C Library master sources