kconfig: add xrealloc() helper

We already have xmalloc(), xcalloc().  Add xrealloc() as well
to save tedious error handling.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>

6 files changed, 16 insertions, 5 deletions

diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c
index f7927391de30..5c12dc91ef34 100644
--- a/scripts/kconfig/confdata.c
+++ b/scripts/kconfig/confdata.c
@@ -201,7 +201,7 @@ static int add_byte(int c, char **lineptr, size_t slen, size_t *n)
         if (new_size > *n) {
                 new_size += LINE_GROWTH - 1;
                 new_size *= 2;
-                nline = realloc(*lineptr, new_size);
+                nline = xrealloc(*lineptr, new_size);
                 if (!nline)
                         return -1;
 
diff --git a/scripts/kconfig/lkc.h b/scripts/kconfig/lkc.h
index 16cb62b92650..4e23febbe4b2 100644
--- a/scripts/kconfig/lkc.h
+++ b/scripts/kconfig/lkc.h
@@ -114,6 +114,7 @@ struct file *file_lookup(const char *name);
 int file_write_dep(const char *name);
 void *xmalloc(size_t size);
 void *xcalloc(size_t nmemb, size_t size);
+void *xrealloc(void *p, size_t size);
 
 struct gstr {
         size_t len;
diff --git a/scripts/kconfig/nconf.gui.c b/scripts/kconfig/nconf.gui.c
index a64b1c31253e..88874acfda36 100644
--- a/scripts/kconfig/nconf.gui.c
+++ b/scripts/kconfig/nconf.gui.c
@@ -6,6 +6,7 @@
  *
  */
 #include "nconf.h"
+#include "lkc.h"
 
 /* a list of all the different widgets we use */
 attributes_t attributes[ATTR_MAX+1] = {0};
@@ -374,7 +375,7 @@ int dialog_inputbox(WINDOW *main_window,
 
         if (strlen(init)+1 > *result_len) {
                 *result_len = strlen(init)+1;
-                *resultp = result = realloc(result, *result_len);
+                *resultp = result = xrealloc(result, *result_len);
         }
 
         /* find the widest line of msg: */
diff --git a/scripts/kconfig/symbol.c b/scripts/kconfig/symbol.c
index c4409ee7fee2..60a76f958f33 100644
--- a/scripts/kconfig/symbol.c
+++ b/scripts/kconfig/symbol.c
@@ -936,7 +936,7 @@ const char *sym_expand_string_value(const char *in)
                 newlen = strlen(res) + strlen(symval) + strlen(src) + 1;
                 if (newlen > reslen) {
                         reslen = newlen;
-                        res = realloc(res, reslen);
+                        res = xrealloc(res, reslen);
                 }
 
                 strcat(res, symval);
diff --git a/scripts/kconfig/util.c b/scripts/kconfig/util.c
index 0e76042473cc..138894ef49ea 100644
--- a/scripts/kconfig/util.c
+++ b/scripts/kconfig/util.c
@@ -104,7 +104,7 @@ void str_append(struct gstr *gs, const char *s)
         if (s) {
                 l = strlen(gs->s) + strlen(s) + 1;
                 if (l > gs->len) {
-                        gs->s   = realloc(gs->s, l);
+                        gs->s = xrealloc(gs->s, l);
                         gs->len = l;
                 }
                 strcat(gs->s, s);
@@ -145,3 +145,12 @@ void *xcalloc(size_t nmemb, size_t size)
         fprintf(stderr, "Out of memory.\n");
         exit(1);
 }
+
+void *xrealloc(void *p, size_t size)
+{
+        p = realloc(p, size);
+        if (p)
+                return p;
+        fprintf(stderr, "Out of memory.\n");
+        exit(1);
+}
diff --git a/scripts/kconfig/zconf.l b/scripts/kconfig/zconf.l
index 0ba4900050c1..02de6fe302a9 100644
--- a/scripts/kconfig/zconf.l
+++ b/scripts/kconfig/zconf.l
@@ -52,7 +52,7 @@ static void append_string(const char *str, int size)
         if (new_size > text_asize) {
                 new_size += START_STRSIZE - 1;
                 new_size &= -START_STRSIZE;
-                text = realloc(text, new_size);
+                text = xrealloc(text, new_size);
                 text_asize = new_size;
         }
         memcpy(text + text_size, str, size);