|
@@ -50,11 +50,12 @@ int pvh_str_free(str *s)
|
|
|
|
|
|
int pvh_str_copy(str *dst, str *src, unsigned int max_size)
|
|
|
{
|
|
|
- unsigned int src_len = src->len + 1 >= max_size ? max_size - 1 : src->len;
|
|
|
+ unsigned int src_len = 0;
|
|
|
|
|
|
if(src == NULL || dst == NULL || src->len <= 0)
|
|
|
return -1;
|
|
|
|
|
|
+ src_len = src->len + 1 >= max_size ? max_size - 1 : src->len;
|
|
|
memset(dst->s, 0, dst->len);
|
|
|
memcpy(dst->s, src->s, src_len);
|
|
|
dst->s[src_len] = '\0';
|