diff options
author | Nicholas Clark <nick@ccl4.org> | 2006-06-11 20:52:36 +0000 |
---|---|---|
committer | Nicholas Clark <nick@ccl4.org> | 2006-06-11 20:52:36 +0000 |
commit | e7f343b6de977b5993b7a5a4707f5051ea388ff2 (patch) | |
tree | 184de79fcc66ba94d970ca6590d5d0a2b77033a5 | |
parent | b1366aafc0ae88aa629334eee83ef65c43f75718 (diff) | |
download | perl-e7f343b6de977b5993b7a5a4707f5051ea388ff2.tar.gz |
A little more work needed to get ext/re/t/re.t test 14 (no segv) passing
with PERL_DESTRUCT_LEVEL=2.
p4raw-id: //depot/perl@28378
-rw-r--r-- | gv.c | 8 | ||||
-rw-r--r-- | regcomp.h | 3 |
2 files changed, 9 insertions, 2 deletions
@@ -943,10 +943,16 @@ Perl_gv_fetchpvn_flags(pTHX_ const char *nambeg, STRLEN full_len, I32 flags, : sv_type == SVt_PVAV ? "@" : sv_type == SVt_PVHV ? "%" : ""), name); + GV *gv; if (USE_UTF8_IN_NAMES) SvUTF8_on(err); qerror(err); - stash = GvHV(gv_fetchpvn_flags("<none>::", 8, GV_ADDMULTI, SVt_PVHV)); + gv = gv_fetchpvn_flags("<none>::", 8, GV_ADDMULTI, SVt_PVHV); + if(!gv) { + /* symbol table under destruction */ + return NULL; + } + stash = GvHV(gv); } else return NULL; @@ -550,9 +550,10 @@ typedef struct _reg_ac_data reg_ac_data; #define DEBUG_TRIE_COMPILE_MORE_r(x) \ DEBUG_TRIE_COMPILE_r( if (SvIV(re_debug_flags) & RE_DEBUG_TRIE_MORE) x ) +/* get_sv() can return NULL during global destruction. */ #define GET_RE_DEBUG_FLAGS DEBUG_r( \ re_debug_flags=get_sv(RE_DEBUG_FLAGS, 1); \ - if (!SvIOK(re_debug_flags)) { \ + if (re_debug_flags && !SvIOK(re_debug_flags)) { \ sv_setiv(re_debug_flags, RE_DEBUG_COMPILE | RE_DEBUG_EXECUTE ); \ } \ ) |