From: Vincent Pit Date: Sat, 29 Aug 2009 15:22:13 +0000 (+0200) Subject: Fall back to the default behaviour when the re::engine::Plugin hint can't be found... X-Git-Tag: v0.08~9 X-Git-Url: http://git.vpit.fr/?p=perl%2Fmodules%2Fre-engine-Plugin.git;a=commitdiff_plain;h=4e38e274a3abc92930103ca9d6114f429aa70bbd Fall back to the default behaviour when the re::engine::Plugin hint can't be found in comp() --- diff --git a/Plugin.xs b/Plugin.xs index 28558a7..c5e9ebd 100644 --- a/Plugin.xs +++ b/Plugin.xs @@ -271,6 +271,10 @@ Plugin_comp(pTHX_ SV * const pattern, U32 flags) re__engine__Plugin re; const rep_hint_t *h; + h = rep_hint(); + if (!h) /* This looks like a pragma leak. Apply the default behaviour */ + return re_compile(pattern, flags); + /* exp/xend version of the pattern & length */ STRLEN plen; char* exp = SvPV((SV*)pattern, plen); @@ -311,12 +315,10 @@ Plugin_comp(pTHX_ SV * const pattern, U32 flags) re->pattern = (SV*)pattern; SvREFCNT_inc(re->pattern); - h = rep_hint(); - /* If there's an exec callback, store it into the private object so * that it will be the one to be called, even if the engine changes * in between */ - if (h && h->exec) { + if (h->exec) { re->cb_exec = h->exec; SvREFCNT_inc_simple_void_NN(h->exec); } @@ -325,12 +327,10 @@ Plugin_comp(pTHX_ SV * const pattern, U32 flags) re->cb_num_capture_buff_STORE = NULL; re->cb_num_capture_buff_LENGTH = NULL; - /* - * Call our callback function if one was defined, if not we've + /* Call our callback function if one was defined, if not we've * already set up all the stuff we're going to to need for - * subsequent exec and other calls - */ - if (h && h->comp) { + * subsequent exec and other calls */ + if (h->comp) { ENTER; SAVETMPS;