X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=t%2Fre-engine-Hooks-TestDist%2FTestDist.xs;h=0b701f77e667839268666548c0227181023d5d28;hb=819b78c9396701a0ef5fe7334e4054dd53c7ef93;hp=0005b019b09b36074583c0b279d01a8f74934ffc;hpb=3873fbc39d250734131e096da47add0cf601d194;p=perl%2Fmodules%2Fre-engine-Hooks.git

diff --git a/t/re-engine-Hooks-TestDist/TestDist.xs b/t/re-engine-Hooks-TestDist/TestDist.xs
index 0005b01..0b701f7 100644
--- a/t/re-engine-Hooks-TestDist/TestDist.xs
+++ b/t/re-engine-Hooks-TestDist/TestDist.xs
@@ -11,6 +11,10 @@
 #define __PACKAGE__     "re::engine::Hooks::TestDist"
 #define __PACKAGE_LEN__ (sizeof(__PACKAGE__)-1)
 
+#ifndef REHT_HAS_PERL
+# define REHT_HAS_PERL(R, V, S) (PERL_REVISION > (R) || (PERL_REVISION == (R) && (PERL_VERSION > (V) || (PERL_VERSION == (V) && (PERL_SUBVERSION >= (S))))))
+#endif
+
 #include "regcomp.h"
 
 STATIC SV *reht_foo_var;
@@ -48,6 +52,12 @@ STATIC void reht_custom_comp_node(pTHX_ regexp *rx, regnode *node) {
  node_name = PL_reg_name[OP(node)];
 }
 
+#if !REHT_HAS_PERL(5, 19, 1)
+
+STATIC struct re_save_state reht_state_bak;
+
+#endif
+
 STATIC void reht_custom_exec_node(pTHX_ regexp *rx, regnode *node, regmatch_info *reginfo, regmatch_state *st) {
  STRLEN      node_namelen;
  const char *node_name;
@@ -55,6 +65,12 @@ STATIC void reht_custom_exec_node(pTHX_ regexp *rx, regnode *node, regmatch_info
  node_name    = PL_reg_name[OP(node)];
  node_namelen = strlen(node_name);
 
+#if !REHT_HAS_PERL(5, 19, 1)
+ /* The global regexp state may be overwritten if the Perl callback does a
+  * regexp match. */
+ reht_state_bak = PL_reg_state;
+#endif
+
  dSP;
 
  ENTER;
@@ -69,6 +85,10 @@ STATIC void reht_custom_exec_node(pTHX_ regexp *rx, regnode *node, regmatch_info
 
  FREETMPS;
  LEAVE;
+
+#if !REHT_HAS_PERL(5, 19, 1)
+ PL_reg_state = reht_state_bak;
+#endif
 }
 
 /* --- XS ------------------------------------------------------------------ */