bug-gnulib
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH] getprogname: fix port to IRIX


From: Paul Eggert
Subject: [PATCH] getprogname: fix port to IRIX
Date: Sun, 8 Jan 2017 22:14:05 -0800

* lib/getprogname.c (getprogname) [__sgi]:
Don't dump core if malloc returns NULL.
---
 ChangeLog         | 4 ++++
 lib/getprogname.c | 7 +++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 79475df..0d60422 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2017-01-08  Paul Eggert  <address@hidden>
 
+       getprogname: fix port to IRIX
+       * lib/getprogname.c (getprogname) [__sgi]:
+       Don't dump core if malloc returns NULL.
+
        dfa: fix reallocation bug when matching newlines
        Problem reported for sed by S. Gilles (Bug#25390).
        * lib/dfa.c (realloc_trans_if_necessary): Move earlier.
diff --git a/lib/getprogname.c b/lib/getprogname.c
index 729f01e..abc03ec 100644
--- a/lib/getprogname.c
+++ b/lib/getprogname.c
@@ -169,8 +169,11 @@ getprogname (void)
           char *namenul = memchr (name, '\0', namesize);
           size_t namelen = namenul ? namenul - name : namesize;
           char *namecopy = malloc (namelen + 1);
-          namecopy[namelen] = 0;
-          return memcpy (namecopy, name, namelen);
+          if (namecopy)
+            {
+              namecopy[namelen] = 0;
+              return memcpy (namecopy, name, namelen);
+            }
         }
     }
   return NULL;
-- 
2.9.3




reply via email to

[Prev in Thread] Current Thread [Next in Thread]