summaryrefslogtreecommitdiffstats
path: root/newlib/libc/argz/argz_add_sep.c
diff options
context:
space:
mode:
authorCorinna Vinschen <corinna@vinschen.de>2007-05-29 07:49:14 +0000
committerCorinna Vinschen <corinna@vinschen.de>2007-05-29 07:49:14 +0000
commit76a2ee78b6840b23c54cf9239027014e06ae3818 (patch)
tree0097bc604801a79877ac9720873fddcb2c0be927 /newlib/libc/argz/argz_add_sep.c
parentd74d6b17cd62a9d475b29a02d373112006aa2956 (diff)
downloadcygnal-76a2ee78b6840b23c54cf9239027014e06ae3818.tar.gz
cygnal-76a2ee78b6840b23c54cf9239027014e06ae3818.tar.bz2
cygnal-76a2ee78b6840b23c54cf9239027014e06ae3818.zip
* 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.
Diffstat (limited to 'newlib/libc/argz/argz_add_sep.c')
-rw-r--r--newlib/libc/argz/argz_add_sep.c11
1 files changed, 7 insertions, 4 deletions
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;
}