srcpkgs/glibc/patches/glibc-upstream-06.patch

   1 From 302434688d925134065498b4a5574f6ee6bfb9fd Mon Sep 17 00:00:00 2001
   2 From: Florian Weimer <fweimer@redhat.com>
   3 Date: Thu, 10 Aug 2017 09:10:36 +0200
   4 Subject: [PATCH 06] nss: Call __resolv_context_put before early return in
   5  get*_r [BZ #21932]
   6
   7 This corrects an oversight introduced in commit
   8 352f4ff9a268b81ef5d4b2413f582565806e4790 (resolv: Introduce struct
   9 resolv_context).
  10
  11 (cherry picked from commit 3016149819268b14660f791b971910ccc2cc13e5)
  12 ---
  13  ChangeLog         |  6 ++++++
  14  NEWS              |  1 +
  15  nss/getXXbyYY_r.c | 10 +++++++++-
  16  3 files changed, 16 insertions(+), 1 deletion(-)
  17
  18 diff --git a/ChangeLog b/ChangeLog
  19 index 459062cc20..3127648626 100644
  20 --- a/ChangeLog
  21 +++ b/ChangeLog
  22 @@ -1,3 +1,9 @@
  23 +2017-08-09  Florian Weimer  <fweimer@redhat.com>
  24 +
  25 +       [BZ #21932]
  26 +       * nss/getXXbyYY_r.c (REENTRANT_NAME): Call __resolv_context_put
  27 +       before early return.
  28 +
  29  2017-08-09  Adhemerval Zanella  <adhemerval.zanella@linaro.org>
  30
  31         [BZ #21780]
  32 diff --git a/NEWS b/NEWS
  33 index 9a64579658..ec6cf34122 100644
  34 --- a/NEWS
  35 +++ b/NEWS
  36 @@ -10,6 +10,7 @@ Version 2.26.1
  37  The following bugs are resolved with this release:
  38
  39    [21885] getaddrinfo: Release resolver context on error in gethosts
  40 +  [21932] Unpaired __resolv_context_get in generic get*_r implementation
  41  \f
  42  Version 2.26
  43
  44 diff --git a/nss/getXXbyYY_r.c b/nss/getXXbyYY_r.c
  45 index 6c547ea1ca..bce80e05dd 100644
  46 --- a/nss/getXXbyYY_r.c
  47 +++ b/nss/getXXbyYY_r.c
  48 @@ -234,6 +234,9 @@ INTERNAL (REENTRANT_NAME) (ADD_PARAMS, LOOKUP_TYPE *resbuf, char *buffer,
  49                                       H_ERRNO_VAR_P))
  50      {
  51      case -1:
  52 +# ifdef NEED__RES
  53 +      __resolv_context_put (res_ctx);
  54 +# endif
  55        return errno;
  56      case 1:
  57  #ifdef NEED_H_ERRNO
  58 @@ -253,7 +256,12 @@ INTERNAL (REENTRANT_NAME) (ADD_PARAMS, LOOKUP_TYPE *resbuf, char *buffer,
  59        nscd_status = NSCD_NAME (ADD_VARIABLES, resbuf, buffer, buflen, result
  60                                H_ERRNO_VAR);
  61        if (nscd_status >= 0)
  62 -       return nscd_status;
  63 +       {
  64 +# ifdef NEED__RES
  65 +         __resolv_context_put (res_ctx);
  66 +# endif
  67 +         return nscd_status;
  68 +       }
  69      }
  70  #endif
  71
  72