From d1d9aea937c7a9f71391eb22f11e4e75cdc23ae0 Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Sat, 22 Sep 2007 00:53:14 +0000 Subject: [PATCH] handle possible case where the current native trace is NULL svn: r7397 --- src/mzscheme/src/fun.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/mzscheme/src/fun.c b/src/mzscheme/src/fun.c index 8518221f59..6de6686ba3 100644 --- a/src/mzscheme/src/fun.c +++ b/src/mzscheme/src/fun.c @@ -4996,8 +4996,9 @@ internal_call_cc (int argc, Scheme_Object *argv[]) && (SAME_OBJ(ret, sub_cont->native_trace) /* Maybe a single-function loop, where we re-allocated the last pair in the trace, but it's the same name: */ - || (SCHEME_PAIRP(ret) + || (ret && sub_cont->native_trace + && SCHEME_PAIRP(ret) && SCHEME_PAIRP(sub_cont->native_trace) && SAME_OBJ(SCHEME_CAR(ret), SCHEME_CAR(sub_cont->native_trace)) && SAME_OBJ(SCHEME_CDR(ret), SCHEME_CDR(sub_cont->native_trace))))