summaryrefslogtreecommitdiff
path: root/libguile/throw.c
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2011-02-09 23:13:53 +0100
committerAndy Wingo <wingo@pobox.com>2011-02-09 23:17:09 +0100
commitc7c2d875478f2dea583c21fed4b3231e43e88d69 (patch)
tree31316e315f56b19f6921bce97b6e9bda5e7e75d6 /libguile/throw.c
parent5a5885215afae3c547ae6ca10e769704b0f7e3d9 (diff)
downloadguile-c7c2d875478f2dea583c21fed4b3231e43e88d69.tar.gz
fix a couple of (system vm frame) accesses on boot errors
* libguile/backtrace.c (display_error_body): Don't look up the frame-source if Guile isn't initialized yet. Fixes display-error before boot has finished. * libguile/throw.c (handler_message): Likewise, don't backtrace before boot has finished, because we can't load (system vm frame).
Diffstat (limited to 'libguile/throw.c')
-rw-r--r--libguile/throw.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libguile/throw.c b/libguile/throw.c
index bdc3829b7..5c25524b4 100644
--- a/libguile/throw.c
+++ b/libguile/throw.c
@@ -404,7 +404,7 @@ handler_message (void *handler_data, SCM tag, SCM args)
SCM parts = SCM_CADDR (args);
SCM rest = SCM_CADDDR (args);
- if (SCM_BACKTRACE_P && scm_is_true (stack))
+ if (SCM_BACKTRACE_P && scm_is_true (stack) && scm_initialized_p)
{
SCM highlights;