connection: Check object types in message parameters

diff --git a/src/connection.c b/src/connection.c
index 1963314..a10508d 100644 (file)
--- a/src/connection.c
+++ b/src/connection.c
@@ -594,6 +594,16 @@ wl_connection_demarshal(struct wl_connection *connection,
                                goto err;
                        }
 
+                       if (*object != NULL && message->types[i-2] != NULL &&
+                           (*object)->interface != message->types[i-2]) {
+                               printf("invalid object (%d), type (%s), "
+                                       "message %s(%s)\n",
+                                      *p, (*object)->interface->name,
+                                      message->name, message->signature);
+                               errno = EINVAL;
+                               goto err;
+                       }
+
                        p++;
                        break;
                case 'n':