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

Standardize error checking for strtol calls

Browse Source 
This tightens up the strtol() error checking in several places where it
is used for parsing environment variables, and in the backlight
interface that is reading numbers from files under /sys/class/backlight.
All of these uses are expecting strings containing decimal numbers and
nothing else, so the error checking can all be tightened up and made
consistent with other strtol() calls.

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

Signed-off-by: Bryce Harrington <bryce@osg.samsung.com>
Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Bryce Harrington 2016-08-03 17:40:48 -07:00
parent 295e9d004e
commit 913d7c15f7
4 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
compositor/main.c
View File

@ -1699,8 +1699,9 @@ int main(int argc, char *argv[])
server_socket = getenv("WAYLAND_SERVER_SOCKET");
if (server_socket) {
weston_log("Running with single client\n");
errno = 0;
fd = strtol(server_socket, &end, 10);
if (*end != '\0')
if (errno != 0 || end == server_socket || *end != '\0')
fd = -1;
} else {
fd = -1;

2
compositor/systemd-notify.c
View File

@ -146,7 +146,7 @@ module_init(struct weston_compositor *compositor,
errno = 0;
watchdog_time_conv = strtol(watchdog_time_env, &tail, 10);
if ((errno != 0) || (*tail != '\0'))
if (errno != 0 || tail == watchdog_time_env || *tail != '\0')
return 0;
/* Convert 'WATCHDOG_USEC' to milliseconds and notify

3
libweston/compositor.c
View File

@ -4628,8 +4628,9 @@ weston_environment_get_fd(const char *env)
e = getenv(env);
if (!e)
return -1;
errno = 0;
fd = strtol(e, &end, 10);
if (*end != '\0')
if (errno != 0 || end == e || *end != '\0')
return -1;
flags = fcntl(fd, F_GETFD);

10
libweston/libbacklight.c
View File

@ -48,6 +48,7 @@ static long backlight_get(struct backlight *backlight, char *node)
{
char buffer[100];
char *path;
char *end;
int fd;
long value, ret;
@ -65,8 +66,15 @@ static long backlight_get(struct backlight *backlight, char *node)
goto out;
}
value = strtol(buffer, NULL, 10);
errno = 0;
value = strtol(buffer, &end, 10);
if (errno != 0 || end == buffer || *end != '\0') {
ret = -1;
goto out;
}
ret = value;
out:
if (fd >= 0)
close(fd);