Commit a2cbdefc authored by Bryce Harrington's avatar Bryce Harrington Committed by Daniel Stone

wayland-client: Require base 10 for WAYLAND_SOCKET, explicitly

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

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: default avatarBryce Harrington <>
Reviewed-by: default avatarYong Bakos <>
Reviewed-by: Daniel Stone's avatarDaniel Stone <>
parent b05baa6a
......@@ -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;
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment