summaryrefslogtreecommitdiffstats
path: root/newlib/libc/argz/argz_append.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_append.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_append.c')
-rw-r--r--newlib/libc/argz/argz_append.c13
1 files changed, 8 insertions, 5 deletions
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;
}