mir/lxc
2
0
Fork 0
mirror of git://github.com/lxc/lxc synced 2025-09-05 03:19:33 +00:00
Code Issues Releases Wiki Activity

string_utils: get around GCC-11 false positives

Browse Source 
by getting rid of stpncpy

Tested with gcc (GCC) 11.1.1 20210428 (Red Hat 11.1.1-1)

Closes https://github.com/lxc/lxc/issues/3752

Signed-off-by: Evgeny Vereshchagin <evvers@ya.ru>
This commit is contained in:
Evgeny Vereshchagin
2021-05-03 20:44:05 +00:00
committed by Christian Brauner
parent 15e2d139c7
commit 4056542b51
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/lxc/string_utils.c
View File

@@ -877,14 +877,18 @@ int parse_byte_size_string(const char *s, long long int *converted)
char *end;
char dup[INTTYPE_TO_STRLEN(long long int)] = {0};
char suffix[3] = {0};
size_t len;
if (is_empty_string(s))
if (!s)
return ret_errno(EINVAL);
end = stpncpy(dup, s, sizeof(dup) - 1);
if (*end != '\0')
len = strlen(s);
if (len == 0 || len > sizeof(dup) - 1)
return ret_errno(EINVAL);
memcpy(dup, s, len);
end = dup + len;
if (isdigit(*(end - 1)))
suffix_len = 0;
else if (isalpha(*(end - 1)))