mirrors/wayland
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/wayland.git synced 2026-03-21 05:34:00 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

conection: Handle demarshal errors a little less dramatically

Browse source
This commit is contained in:
Kristian Høgsberg 2011-07-18 13:10:49 -04:00
parent 728d09936f
commit a8db57befa
1 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
wayland/connection.c
View file

@ -509,13 +509,17 @@ wl_connection_demarshal(struct wl_connection *connection,
count = strlen(message->signature) + 2; count = strlen(message->signature) + 2;
if (count > ARRAY_LENGTH(closure->types)) { if (count > ARRAY_LENGTH(closure->types)) {
printf("too many args (%d)\n", count); printf("too many args (%d)\n", count);
assert(0); errno = EINVAL;
wl_connection_consume(connection, size);
return NULL;
} }
extra_space = wl_message_size_extra(message); extra_space = wl_message_size_extra(message);
if (sizeof closure->buffer < size + extra_space) { if (sizeof closure->buffer < size + extra_space) {
printf("request too big, should malloc tmp buffer here\n"); printf("request too big, should malloc tmp buffer here\n");
assert(0); errno = ENOMEM;
wl_connection_consume(connection, size);
return NULL;
} }
closure->message = message; closure->message = message;