Fix crash in resolver on memory allocation failure (bug 23005)

(cherry picked from commit f178e59fa5eefbbd37fde040ae8334aa5c857ee1)

diff --git a/ChangeLog b/ChangeLog
index f9d7618431f1ae85e6cb4607d28851ea1395fb59..89ecd49d19a39668931e2eef72c42e3847c9747e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2018-03-27  Andreas Schwab  <schwab@suse.de>
+
+       [BZ #23005]
+       * resolv/res_send.c (__res_context_send): Return ENOMEM if
+       allocation of private copy of nsaddr_list fails.
+
 2018-03-20  Joseph Myers  <joseph@codesourcery.com>
 
        [BZ #17343]

diff --git a/resolv/res_send.c b/resolv/res_send.c
index dde0425a33d2b3d889d668a6ce311347ad8e4436..7debf143f7c26a98f02700a6ebdc1fd9a49538d0 100644 (file)
--- a/resolv/res_send.c
+++ b/resolv/res_send.c
@@ -471,6 +471,11 @@ __res_context_send (struct resolv_context *ctx,
                                        '\0',
                                        sizeof (struct sockaddr_in6)
                                        - sizeof (struct sockaddr_in));
+                       else
+                         {
+                           __set_errno (ENOMEM);
+                           return -1;
+                         }
                }
                EXT(statp).nscount = statp->nscount;
        }