From 76a2ee78b6840b23c54cf9239027014e06ae3818 Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Tue, 29 May 2007 07:49:14 +0000 Subject: * libc/argz/argz_add_sep.c (argz_add_sep): Handle empty string argument. * libc/argz/argz_append.c (argz_append): Handle empty buf argument. * libc/argz/argz_create_sep.c (argz_create_sep): Return (NULL, 0) on empty input strings. * libc/argz/argz_extract.c (argz_extract): Check argz_len before looping through argz. * libc/argz/argz_stringify.c (argz_stringify): Ditto. --- newlib/libc/argz/argz_append.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'newlib/libc/argz/argz_append.c') diff --git a/newlib/libc/argz/argz_append.c b/newlib/libc/argz/argz_append.c index 7519e1608..75d5c9315 100644 --- a/newlib/libc/argz/argz_append.c +++ b/newlib/libc/argz/argz_append.c @@ -16,13 +16,16 @@ _DEFUN (argz_append, (argz, argz_len, buf, buf_len), const char *buf _AND size_t buf_len) { - size_t last = *argz_len; + if (buf_len) + { + size_t last = *argz_len; - *argz_len += buf_len; + *argz_len += buf_len; - if(!(*argz = (char *)realloc(*argz, *argz_len))) - return ENOMEM; + if(!(*argz = (char *)realloc(*argz, *argz_len))) + return ENOMEM; - memcpy(*argz + last, buf, buf_len); + memcpy(*argz + last, buf, buf_len); + } return 0; } -- cgit v1.2.3