diff options
| author | Andy Wingo <wingo@pobox.com> | 2010-10-01 16:36:34 +0200 |
|---|---|---|
| committer | Andy Wingo <wingo@pobox.com> | 2010-10-01 16:36:34 +0200 |
| commit | 138bf22d8272fd1412bd522833dd252e791ad95d (patch) | |
| tree | c72f9f656ed04b5630361fdb041d4f1855ed1bc4 /libguile/stackchk.c | |
| parent | d0110327ab0c95f245d2e72846ed1f7661232f18 (diff) | |
| download | guile-138bf22d8272fd1412bd522833dd252e791ad95d.tar.gz | |
scm_report_stack_overflow eventually resets scm_stack_checking_enabled_p
* libguile/stackchk.c (scm_report_stack_overflow): Surround in a
dynwind, so that scm_stack_checking_enabled_p is reset when the error
throws.
Diffstat (limited to 'libguile/stackchk.c')
| -rw-r--r-- | libguile/stackchk.c | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/libguile/stackchk.c b/libguile/stackchk.c index b14a71259..6cfb783b1 100644 --- a/libguile/stackchk.c +++ b/libguile/stackchk.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1995,1996,1997, 2000, 2001, 2006, 2008 Free Software Foundation, Inc. +/* Copyright (C) 1995,1996,1997, 2000, 2001, 2006, 2008, 2010 Free Software Foundation, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License @@ -26,6 +26,7 @@ #include "libguile/ports.h" #include "libguile/root.h" #include "libguile/threads.h" +#include "libguile/dynwind.h" #include "libguile/stackchk.h" @@ -38,15 +39,30 @@ int scm_stack_checking_enabled_p; SCM_SYMBOL (scm_stack_overflow_key, "stack-overflow"); +static void +reset_scm_stack_checking_enabled_p (void *arg) +{ + scm_stack_checking_enabled_p = (int)(scm_t_bits)arg; +} + void scm_report_stack_overflow () { + scm_dynwind_begin (0); /* non-rewindable frame */ + scm_dynwind_unwind_handler (reset_scm_stack_checking_enabled_p, + (void*)(scm_t_bits)scm_stack_checking_enabled_p, + SCM_F_WIND_EXPLICITLY); + scm_stack_checking_enabled_p = 0; + scm_error (scm_stack_overflow_key, NULL, "Stack overflow", SCM_BOOL_F, SCM_BOOL_F); + + /* not reached */ + scm_dynwind_end (); } #endif |