]> git.sur5r.net Git - openocd/commitdiff
binarybuffer: use strndup to allocate string
authorSpencer Oliver <spen@spen-soft.co.uk>
Thu, 1 Dec 2011 14:15:10 +0000 (14:15 +0000)
committerAndreas Fritiofson <andreas.fritiofson@gmail.com>
Thu, 1 Dec 2011 19:11:20 +0000 (19:11 +0000)
Change-Id: I65d8f37b18d5b5a798406b956f50ab7bb550e172
Signed-off-by: Spencer Oliver <spen@spen-soft.co.uk>
Reviewed-on: http://openocd.zylin.com/246
Tested-by: jenkins
Reviewed-by: Andreas Fritiofson <andreas.fritiofson@gmail.com>
src/helper/binarybuffer.c

index 5732689c01e95fd8ff1033e45427a5bc0417d821..4f2ed6eb1bbcff941ae33ab3f1761546d2fc39a0 100644 (file)
@@ -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);