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

multi-resource: Check for no digits in time description

Browse Source 
strtoul(nptr, endptr, ...) will set *endptr to nptr in the case of where
no digits were read from the string.  E.g. "foo:bar" should trigger an
error, instead of being read as "0:0" and allowed through.

Signed-off-by: Bryce Harrington <bryce@osg.samsung.com>
This commit is contained in:
Bryce Harrington
2016-07-08 18:05:56 -07:00
parent f6051cbab8
commit 9c09fe70c7
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
clients/multi-resource.c
+4 -3
View File
@@ -434,12 +434,13 @@ create_device(struct display *display, const char *time_desc, int type)
errno = 0; errno = 0;
start_time = strtoul(time_desc, &tail, 10); start_time = strtoul(time_desc, &tail, 10);
if (errno) if (errno || tail == time_desc)
goto error; goto error;
if (*tail == ':') { if (*tail == ':') {
end_time = strtoul(tail + 1, &tail, 10); time_desc = tail + 1;
if (errno || *tail != '\0') end_time = strtoul(time_desc, &tail, 10);
if (errno || tail == time_desc || *tail != '\0')
goto error; goto error;
} else if (*tail != '\0') { } else if (*tail != '\0') {
goto error; goto error;