[PATCH] wayland-client: Require base 10 for WAYLAND_SOCKET, explicitly

Bryce Harrington bryce at osg.samsung.com
Fri Jul 8 23:42:30 UTC 2016


The third arg to strtol() specifies the base to assume for the number.
When 0 is passed, as is currently done in wayland-client.c, hexadecimal
and octal numbers are permitted and automatically detected and
converted.

I can find no indication that we would ever expect use of hexadecimal or
octal for socket fd's.  So be explicit about what base we're assuming
here and avoid any potential surprises.

Signed-off-by: Bryce Harrington <bryce at osg.samsung.com>
---
 src/wayland-client.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/wayland-client.c b/src/wayland-client.c
index 03c087a..3d7361e 100644
--- a/src/wayland-client.c
+++ b/src/wayland-client.c
@@ -1006,7 +1006,7 @@ wl_display_connect(const char *name)
 	if (connection) {
 		int prev_errno = errno;
 		errno = 0;
-		fd = strtol(connection, &end, 0);
+		fd = strtol(connection, &end, 10);
 		if (errno != 0 || connection == end || *end != '\0')
 			return NULL;
 		errno = prev_errno;
-- 
1.9.1



More information about the wayland-devel mailing list