Merge pull request #100 from Shopify/fix-segfault-in-rs_stack_mark

Fix segfault in rs_stack_mark
Shopify · Dec 8, 2023 · 042322b · 042322b
2 parents c2923d9 + b6002ee
commit 042322b
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 15 deletions.
diff --git a/ext/rotoscope/rotoscope.c b/ext/rotoscope/rotoscope.c
@@ -146,24 +146,21 @@ static void rs_dealloc(void *data) {
   xfree(config);
 }
 
-static size_t rs_memsize(const void *data) {
-  return sizeof(Rotoscope);
-}
+static size_t rs_memsize(const void *data) { return sizeof(Rotoscope); }
 
 static const rb_data_type_t rs_data_type = {
     .wrap_struct_name = "Rotoscope",
-    .function = {
-        .dmark = rs_gc_mark,
-        .dfree = rs_dealloc,
-        .dsize = rs_memsize,
-    },
-    .flags = RUBY_TYPED_FREE_IMMEDIATELY
-};
+    .function =
+        {
+            .dmark = rs_gc_mark,
+            .dfree = rs_dealloc,
+            .dsize = rs_memsize,
+        },
+    .flags = RUBY_TYPED_FREE_IMMEDIATELY};
 
 static VALUE rs_alloc(VALUE klass) {
   Rotoscope *config;
-  VALUE self =
-      TypedData_Make_Struct(klass, Rotoscope, &rs_data_type, config);
+  VALUE self = TypedData_Make_Struct(klass, Rotoscope, &rs_data_type, config);
   config->self = self;
   config->pid = getpid();
   config->tid = current_thread_id();

diff --git a/ext/rotoscope/stack.c b/ext/rotoscope/stack.c
@@ -62,8 +62,10 @@ void rs_stack_init(rs_stack_t *stack, unsigned int capacity) {
 }
 
 void rs_stack_mark(rs_stack_t *stack) {
-  for (int i = 0; i <= stack->top; i++) {
-    rs_stack_frame_t *frame = &stack->contents[i];
-    rs_method_desc_mark(&frame->method);
+  if (stack->contents) {
+    for (int i = 0; i <= stack->top; i++) {
+      rs_stack_frame_t *frame = &stack->contents[i];
+      rs_method_desc_mark(&frame->method);
+    }
   }
 }