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_add_sep.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'newlib/libc/argz/argz_add_sep.c') diff --git a/newlib/libc/argz/argz_add_sep.c b/newlib/libc/argz/argz_add_sep.c index 5a56ec931..7dfbb4d6e 100644 --- a/newlib/libc/argz/argz_add_sep.c +++ b/newlib/libc/argz/argz_add_sep.c @@ -23,11 +23,14 @@ _DEFUN (argz_add_sep, (argz, argz_len, str, sep), argz_create_sep (str, sep, &str_argz, &str_argz_len); - *argz_len += str_argz_len; + if (str_argz_len) + { + *argz_len += str_argz_len; - if(!(*argz = (char *)realloc(*argz, *argz_len))) - return ENOMEM; + if(!(*argz = (char *)realloc(*argz, *argz_len))) + return ENOMEM; - memcpy(*argz + last, str_argz, str_argz_len); + memcpy(*argz + last, str_argz, str_argz_len); + } return 0; } -- cgit v1.2.3