about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAndreas Schwab <schwab@suse.de>2018-11-05 12:47:30 +0100
committerAndreas Schwab <schwab@suse.de>2018-11-05 14:48:24 +0100
commitbd3b0fbae33a9a4cc5e2daf049443d5cf03d4251 (patch)
tree3f222e9bb793f90b280660be561e41b09deb985e
parentfc1c7bdc6d61d7571b3a2ed0f718c98170bd9711 (diff)
downloadglibc-bd3b0fbae33a9a4cc5e2daf049443d5cf03d4251.tar.gz
glibc-bd3b0fbae33a9a4cc5e2daf049443d5cf03d4251.tar.xz
glibc-bd3b0fbae33a9a4cc5e2daf049443d5cf03d4251.zip
libanl: properly cleanup if first helper thread creation failed (bug 22927)
-rw-r--r--ChangeLog6
-rw-r--r--resolv/gai_misc.c7
2 files changed, 11 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index ef268e8337..5268012d24 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2018-11-05  Andreas Schwab  <schwab@suse.de>
+
+	[BZ #22927]
+	* resolv/gai_misc.c (__gai_enqueue_request): Don't crash if
+	creating the first helper thread failed.
+
 2018-11-03  Samuel Thibault  <samuel.thibault@ens-lyon.org>
 
 	* sysdeps/mach/hurd/msync.c: New file.
diff --git a/resolv/gai_misc.c b/resolv/gai_misc.c
index e7c3b63cc5..80a2cff835 100644
--- a/resolv/gai_misc.c
+++ b/resolv/gai_misc.c
@@ -261,8 +261,11 @@ __gai_enqueue_request (struct gaicb *gaicbp)
 	      /* We cannot create a thread in the moment and there is
 		 also no thread running.  This is a problem.  `errno' is
 		 set to EAGAIN if this is only a temporary problem.  */
-	      assert (lastp->next == newp);
-	      lastp->next = NULL;
+	      assert (requests == newp || lastp->next == newp);
+	      if (lastp != NULL)
+		lastp->next = NULL;
+	      else
+		requests = NULL;
 	      requests_tail = lastp;
 
 	      newp->next = freelist;