mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

config-parser: Improve error checks for strtol/strtoul calls

Browse Source 
Check errno, which is set of over/underflow, out of range, etc.  Also
check for empty strings (the usages covered in this patch already also
cover the case where there are non-digits present).  Set errno to 0
before making the strto*l call in case of pre-existing errors
(i.e. ENOTTY when running under the testsuite).

This follows the error checking style used in Wayland
(c.f. wayland-client.c and scanner.c).

In tests, also check errno, and add testcases for parsing '0'.

Signed-off-by: Bryce Harrington <bryce@osg.samsung.com>
Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>
This commit is contained in:
Bryce Harrington
2016-07-07 14:08:28 -07:00
parent e4cb3c2ce2
commit cbc053781e
2 changed files with 38 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
shared/config-parser.c
+4 -2
View File
@@ -169,8 +169,9 @@ weston_config_section_get_int(struct weston_config_section *section,
return -1;
}
errno = 0;
*value = strtol(entry->value, &end, 0);
if (*end != '\0') {
if (errno != 0 || end == entry->value || *end != '\0') {
*value = default_value;
errno = EINVAL;
return -1;
@@ -195,8 +196,9 @@ weston_config_section_get_uint(struct weston_config_section *section,
return -1;
}
errno = 0;
*value = strtoul(entry->value, &end, 0);
if (*end != '\0') {
if (errno != 0 || end == entry->value || *end != '\0') {
*value = default_value;
errno = EINVAL;
return -1;