Switch to use safe_strtoint instead of strtol
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>
diff --git a/libweston/compositor.c b/libweston/compositor.c
index e9c2a83..b17c76d 100644
--- a/libweston/compositor.c
+++ b/libweston/compositor.c
@@ -58,6 +58,7 @@
#include "presentation-time-server-protocol.h"
#include "shared/helpers.h"
#include "shared/os-compatibility.h"
+#include "shared/string-helpers.h"
#include "shared/timespec-util.h"
#include "git-version.h"
#include "version.h"
@@ -4622,15 +4623,11 @@
WL_EXPORT int
weston_environment_get_fd(const char *env)
{
- char *e, *end;
+ char *e;
int fd, flags;
e = getenv(env);
- if (!e)
- return -1;
- errno = 0;
- fd = strtol(e, &end, 10);
- if (errno != 0 || end == e || *end != '\0')
+ if (!e || !safe_strtoint(e, &fd))
return -1;
flags = fcntl(fd, F_GETFD);