Make our fallback getline more compliant.

* don't use xmalloc/xrealloc, but return -1 in case of memory allocation
  failure
* modify the parameters only when allocation succeeds

1 files changed, 10 insertions, 4 deletions

diff --git a/src/history.c b/src/history.c
index 7a6cf15..10496d2 100644
--- a/src/history.c
+++ b/src/history.c
@@ -75,12 +75,14 @@ static struct history {
 
 #ifndef HAVE_GETLINE
 ssize_t
-getline(char **lineptr, size_t *n, FILE *f)
+getline (char **lineptr, size_t *n, FILE *f)
 {
   size_t ofs;
 
-  if (!*lineptr) {
-    *lineptr = xmalloc (4096);
+  if (*lineptr == NULL) {
+    *lineptr = malloc (4096);
+    if (*lineptr == NULL)
+      return -1;
     *n = 4096;
   }
   ofs = 0;
@@ -99,10 +101,14 @@ getline(char **lineptr, size_t *n, FILE *f)
     if (ofs > 0 && (*lineptr)[ofs-1] == '\n')
       return ofs;
     if (ofs + 1 == *n) {
+      void *tmp;
       if (*n >= INT_MAX - 4096)
 	return -1;
+      tmp = realloc (*lineptr, *n + 4096);
+      if (tmp == NULL)
+        return -1;
+      *lineptr = tmp;
       *n += 4096;
-      *lineptr = xrealloc(*lineptr, *n);
     }
   } while(1);
 }