connection: Make sure we can invoke closures built with wl_closure_vmarshal()

1 files changed, 7 insertions, 0 deletions

diff --git a/src/connection.c b/src/connection.c
index ffae35d..a599f91 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -422,6 +422,9 @@ wl_closure_vmarshal(struct wl_closure *closure,
 	end = &closure->buffer[ARRAY_LENGTH(closure->buffer)];
 	p = &start[2];
 
+	closure->types[0] = &ffi_type_pointer;
+	closure->types[1] = &ffi_type_pointer;
+
 	for (i = 2; i < count; i++) {
 		switch (message->signature[i - 2]) {
 		case 'u':
@@ -538,6 +541,9 @@ wl_closure_vmarshal(struct wl_closure *closure,
 	closure->message = message;
 	closure->count = count;
 
+	ffi_prep_cif(&closure->cif, FFI_DEFAULT_ABI,
+		     closure->count, &ffi_type_void, closure->types);
+
 	return 0;
 
 err:
@@ -723,6 +729,7 @@ wl_connection_demarshal(struct wl_connection *connection,
 	}
 
 	closure->count = i;
+
 	ffi_prep_cif(&closure->cif, FFI_DEFAULT_ABI,
 		     closure->count, &ffi_type_void, closure->types);