Changeset 15091

Timestamp:

Nov 23, 2011, 1:59:03 PM (13 years ago)

Author:

R. Matthew Emerson

Message:

In create_exception_callback_frame(), try to figure out if a tra
on the top of the stack looks reasonable before dereferencing it.
Bug if it looks suspect.

File:

• trunk/source/lisp-kernel/x86-exceptions.c (modified) (1 diff)

trunk/source/lisp-kernel/x86-exceptions.c

@@ -411 +411 @@
   f = xpGPR(xp,Ifn);
   tra = *(LispObj*)(xpGPR(xp,Isp));
-  tra_f = tra_function(tra);
+  if (tra_p(tra)) {
+    char *p = (char *)tra;
+    extern char *spentry_start, *spentry_end;
+
+    if (ptr_in_area(p, tcr->ts_area) ||
+        (p > spentry_start && p < spentry_end) ||
+        in_any_consing_area(tra))
+      tra_f = tra_function(tra);
+    else
+      Bug(xp, "martian tra %p\n", tra);
+  }
   abs_pc = (LispObj)xpPC(xp);
 #if WORD_SIZE == 64