From a8db57befa3263c6de24fd9762a4aec3b564d4d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= Date: Mon, 18 Jul 2011 13:10:49 -0400 Subject: [PATCH] conection: Handle demarshal errors a little less dramatically --- wayland/connection.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/wayland/connection.c b/wayland/connection.c index 4f6a8454..af9a90e8 100644 --- a/wayland/connection.c +++ b/wayland/connection.c @@ -509,13 +509,17 @@ wl_connection_demarshal(struct wl_connection *connection, count = strlen(message->signature) + 2; if (count > ARRAY_LENGTH(closure->types)) { 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); if (sizeof closure->buffer < size + extra_space) { printf("request too big, should malloc tmp buffer here\n"); - assert(0); + errno = ENOMEM; + wl_connection_consume(connection, size); + return NULL; } closure->message = message;