Merge pull request #1041 from undingen/gen_gc_fix

Fix crash inside BoxedGenerator::gcHandler

Merge pull request #1041 from undingen/gen_gc_fix
Fix crash inside BoxedGenerator::gcHandler
110eaaea · Marius Wachtler · e798f40f · cc5f4cd7 · 110eaaea
Commit 110eaaea authored Jan 06, 2016 by Marius Wachtler
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 4 deletions

src/runtime/generator.cpp src/runtime/generator.cpp +5 -4

No files found.
--- a/src/runtime/generator.cpp
+++ b/src/runtime/generator.cpp
@@ -436,11 +436,12 @@ void BoxedGenerator::gcHandler(GCVisitor* v, Box* b) {
        v->visit(&g->arg2);
    if (num_args >= 3)
        v->visit(&g->arg3);
-    if (g->args)
+    if (g->args) {
        v->visit(&g->args);
-    if (num_args > 3)
-        v->visitPotentialRange(reinterpret_cast<void**>(&g->args->elts[0]),
-                               reinterpret_cast<void**>(&g->args->elts[num_args - 3]));
+        if (num_args > 3)
+            v->visitPotentialRange(reinterpret_cast<void**>(&g->args->elts[0]),
+                                   reinterpret_cast<void**>(&g->args->elts[num_args - 3]));
+    }
    if (g->returnValue)
        v->visit(&g->returnValue);
    if (g->exception.type)