From e2c32ba54b2fcf27a766e9c3cb427180a03ea056 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 19 Jun 2008 08:11:51 +0000 Subject: package/config: rebase from upstream (2.6.24.4) From Bernhards tree (1af211ea) --- package/config/util.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'package/config/util.c') diff --git a/package/config/util.c b/package/config/util.c index d782f4b87..a68f7529e 100644 --- a/package/config/util.c +++ b/package/config/util.c @@ -188,12 +188,15 @@ void str_free(struct gstr *gs) /* Append to growable string */ void str_append(struct gstr *gs, const char *s) { - size_t l = strlen(gs->s) + strlen(s) + 1; - if (l > gs->len) { - gs->s = realloc(gs->s, l); - gs->len = l; + size_t l; + if (s) { + l = strlen(gs->s) + strlen(s) + 1; + if (l > gs->len) { + gs->s = realloc(gs->s, l); + gs->len = l; + } + strcat(gs->s, s); } - strcat(gs->s, s); } /* Append printf formatted string to growable string */ -- cgit v1.2.3