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

   1 From 905a6129147e7ee80e8918e23efe212433b8cce7 Mon Sep 17 00:00:00 2001
   2 From: Florian Weimer <fweimer@redhat.com>
   3 Date: Wed, 6 Sep 2017 15:46:54 +0200
   4 Subject: [PATCH 30] resolv: Fix memory leak with OOM during resolv.conf
   5  parsing [BZ #22095]
   6
   7 (cherry picked from commit 5670c4ab256114e869b1df4b05653aa5f909182c)
   8 ---
   9  ChangeLog         | 6 ++++++
  10  NEWS              | 1 +
  11  resolv/res_init.c | 5 +++++
  12  3 files changed, 12 insertions(+)
  13
  14 diff --git a/ChangeLog b/ChangeLog
  15 index fa215c2729..ef2041b9e5 100644
  16 --- a/ChangeLog
  17 +++ b/ChangeLog
  18 @@ -1,5 +1,11 @@
  19  2017-09-06  Florian Weimer  <fweimer@redhat.com>
  20
  21 +       [BZ #22095]
  22 +       * resolv/res_init.c (res_vinit_1): Avoid memory leak in case of
  23 +       dynarray allocation failure.
  24 +
  25 +2017-09-06  Florian Weimer  <fweimer@redhat.com>
  26 +
  27         Remove dead PTR IPv4-to-IPv6 mapping code from nss_dns.
  28         * resolv/nss_dns/dns-host.c (getanswer_r): Remove dead code.
  29         * resolv/tst-res_use_inet6.c (response_ptr_v4, response_ptr_v6):
  30 diff --git a/NEWS b/NEWS
  31 index 8fbf4241d1..62959274b3 100644
  32 --- a/NEWS
  33 +++ b/NEWS
  34 @@ -28,6 +28,7 @@ The following bugs are resolved with this release:
  35    [21932] Unpaired __resolv_context_get in generic get*_r implementation
  36    [21941] powerpc: Restrict xssqrtqp operands to Vector Registers
  37    [21972] assert macro requires operator== (int) for its argument type
  38 +  [22095] resolv: Fix memory leak with OOM during resolv.conf parsing
  39  \f
  40  Version 2.26
  41
  42 diff --git a/resolv/res_init.c b/resolv/res_init.c
  43 index fa46ce7813..4e1f9fe8de 100644
  44 --- a/resolv/res_init.c
  45 +++ b/resolv/res_init.c
  46 @@ -446,6 +446,11 @@ res_vinit_1 (FILE *fp, struct resolv_conf_parser *parser)
  47                      (&parser->nameserver_list);
  48                    if (p != NULL)
  49                      *p = sa;
  50 +                  else
  51 +                    {
  52 +                      free (sa);
  53 +                      return false;
  54 +                    }
  55                  }
  56                continue;
  57              }
  58