Fix segfault on mrb_exc_backtrace.

simon-shopify · simon-shopify · commit 146a9eeb38ac · 2016-01-07T11:24:16.000-05:00
The code to iterate over backtrace locations was changed in #3065, but unfortunately output_backtrace was not correctly updated to forward the callback.
diff --git a/src/backtrace.c b/src/backtrace.c
@@ -175,7 +175,10 @@ output_backtrace_i(mrb_state *mrb, struct backtrace_location_raw *loc_raw, void
 static void
 output_backtrace(mrb_state *mrb, mrb_int ciidx, mrb_code *pc0, output_stream_func func, void *data)
 {
-  each_backtrace(mrb, ciidx, pc0, output_backtrace_i, data);
+  struct output_backtrace_args args;
+  args.func = func;
+  args.data = data;
+  each_backtrace(mrb, ciidx, pc0, output_backtrace_i, &args);
 }
 
 static void

Original file line number	Diff line number	Diff line change
`@@ -175,7 +175,10 @@ output_backtrace_i(mrb_state mrb, struct backtrace_location_raw loc_raw, void`
`175`	`175`	`static void`
`176`	`176`	`output_backtrace(mrb_state mrb, mrb_int ciidx, mrb_code pc0, output_stream_func func, void *data)`
`177`	`177`	`{`
`178`		`- each_backtrace(mrb, ciidx, pc0, output_backtrace_i, data);`
	`178`	`+ struct output_backtrace_args args;`
	`179`	`+ args.func = func;`
	`180`	`+ args.data = data;`
	`181`	`+ each_backtrace(mrb, ciidx, pc0, output_backtrace_i, &args);`
`179`	`182`	`}`
`180`	`183`
`181`	`184`	`static void`