#1087 Fix segfault when enqueueing custom event

SanderMertens · Dec 3, 2023 · d87bc7b · d87bc7b
1 parent 0d6c22e
commit d87bc7b
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 2 deletions.
diff --git a/flecs.c b/flecs.c
@@ -21071,6 +21071,7 @@ void flecs_enqueue(
     }
 
     cmd->is._1.value = desc_cmd;
+    cmd->is._1.size = ECS_SIZEOF(ecs_event_desc_t);
 
     if (desc->param || desc->const_param) {
         ecs_assert(!(desc->const_param && desc->param), ECS_INVALID_PARAMETER, 

diff --git a/src/stage.c b/src/stage.c
@@ -525,6 +525,7 @@ void flecs_enqueue(
     }
 
     cmd->is._1.value = desc_cmd;
+    cmd->is._1.size = ECS_SIZEOF(ecs_event_desc_t);
 
     if (desc->param || desc->const_param) {
         ecs_assert(!(desc->const_param && desc->param), ECS_INVALID_PARAMETER, 

diff --git a/test/api/project.json b/test/api/project.json
@@ -214,7 +214,8 @@
                 "enqueue_event_not_alive_w_data_copy_after_delete_during_merge",
                 "enqueue_event_not_deferred",
                 "enqueue_event_not_deferred_to_async",
-                "enqueue_custom_implicit_any"
+                "enqueue_custom_implicit_any",
+                "enqueue_custom_after_large_cmd"
             ]
         }, {
             "id": "New",

diff --git a/test/api/src/Event.c b/test/api/src/Event.c
@@ -1385,3 +1385,35 @@ void Event_enqueue_custom_implicit_any(void) {
 
     ecs_fini(world);
 }
+
+typedef struct LargeType {
+    char value[8888];
+} LargeType;
+
+void Event_enqueue_custom_after_large_cmd(void) {
+    ecs_world_t *world = ecs_mini();
+
+    ECS_COMPONENT(world, LargeType);
+    ECS_COMPONENT(world, Position);
+
+    ecs_defer_begin(world);
+    ecs_entity_t e = ecs_set(world, 0, LargeType, {{0}});
+    ecs_defer_end(world);
+    test_assert(ecs_has(world, e, LargeType));
+
+    printf("\n\n");
+
+    ecs_defer_begin(world);
+    Position p = {10, 20};
+    ecs_enqueue(world, &(ecs_event_desc_t) {
+        .entity = e,
+        .ids = &(ecs_type_t){ .count = 1, .array = (ecs_id_t[]){ ecs_id(LargeType) }},
+        .event = ecs_id(Position),
+        .param = &p,
+    });
+    ecs_defer_end(world);
+
+    printf("\n\n");
+
+    ecs_fini(world);
+}
diff --git a/test/api/src/main.c b/test/api/src/main.c
@@ -204,6 +204,7 @@ void Event_enqueue_event_not_alive_w_data_copy_after_delete_during_merge(void);
 void Event_enqueue_event_not_deferred(void);
 void Event_enqueue_event_not_deferred_to_async(void);
 void Event_enqueue_custom_implicit_any(void);
+void Event_enqueue_custom_after_large_cmd(void);
 
 // Testsuite 'New'
 void New_setup(void);
@@ -3428,6 +3429,10 @@ bake_test_case Event_testcases[] = {
     {
         "enqueue_custom_implicit_any",
         Event_enqueue_custom_implicit_any
+    },
+    {
+        "enqueue_custom_after_large_cmd",
+        Event_enqueue_custom_after_large_cmd
     }
 };
 
@@ -12994,7 +12999,7 @@ static bake_test_suite suites[] = {
         "Event",
         NULL,
         NULL,
-        31,
+        32,
         Event_testcases
     },
     {