From: Jakub Jelinek <jakub@redhat.com>
Date: Fri, 12 Jan 2007 16:59:03 +0000 (+0000)
Subject: 	[BZ #3559]
X-Git-Tag: cvs/fedora-glibc-2_5-20070712T1701~95
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dcfbf36aae13eac633f11b7f81b7796d0f0cb738;p=thirdparty%2Fglibc.git

	[BZ #3559]
	* sunrpc/svc_run.c (svc_run): Fail instead of segfaulting if
	malloc crashed.
---

diff --git a/ChangeLog b/ChangeLog
index d0852273c37..de3ba28b3b4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-11-27  Jakub Jelinek  <jakub@redhat.com>
+
+	[BZ #3559]
+	* sunrpc/svc_run.c (svc_run): Fail instead of segfaulting if
+	malloc crashed.
+
 2006-11-14  Jakub Jelinek  <jakub@redhat.com>
 
 	* nss/nss_files/files-alias.c (get_next_alias): Set line back
diff --git a/sunrpc/svc_run.c b/sunrpc/svc_run.c
index 017910b4530..d5e24dd0fc9 100644
--- a/sunrpc/svc_run.c
+++ b/sunrpc/svc_run.c
@@ -60,6 +60,12 @@ svc_run (void)
 	return;
 
       my_pollfd = malloc (sizeof (struct pollfd) * svc_max_pollfd);
+      if (my_pollfd == NULL)
+	{
+	  perror (_("svc_run: - out of memory"));
+	  return;
+	}
+
       for (i = 0; i < svc_max_pollfd; ++i)
 	{
 	  my_pollfd[i].fd = svc_pollfd[i].fd;