From 3dde0f47b2b43dfda26f49e487e018d5abe272fe Mon Sep 17 00:00:00 2001 From: Spencer Oliver Date: Thu, 1 Dec 2011 14:15:10 +0000 Subject: binarybuffer: use strndup to allocate string Change-Id: I65d8f37b18d5b5a798406b956f50ab7bb550e172 Signed-off-by: Spencer Oliver Reviewed-on: http://openocd.zylin.com/246 Tested-by: jenkins Reviewed-by: Andreas Fritiofson --- src/helper/binarybuffer.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/helper/binarybuffer.c b/src/helper/binarybuffer.c index 5732689c..4f2ed6eb 100644 --- a/src/helper/binarybuffer.c +++ b/src/helper/binarybuffer.c @@ -255,7 +255,7 @@ static void str_radix_guess(const char **_str, unsigned *_str_len, if (0 != radix) return; const char *str = *_str; - unsigned str_len = *_str_len; + unsigned str_len = *_str_len; if (str[0] == '0' && (str[1] == 'x' || str[1] == 'X')) { radix = 16; @@ -293,9 +293,7 @@ int str_to_buf(const char *str, unsigned str_len, return 0; /* copy to zero-terminated buffer */ - char *charbuf = malloc(str_len + 1); - memcpy(charbuf, str, str_len); - charbuf[str_len] = '\0'; + char *charbuf = strndup(str, str_len); /* number of digits in base-256 notation */ unsigned b256_len = ceil_f_to_u32(str_len * factor); -- cgit v1.2.3-18-g5258