X-Git-Url: http://git.vpit.fr/?p=perl%2Fmodules%2Findirect.git;a=blobdiff_plain;f=indirect.xs;h=3d901d0f7d457d9e0af25a5816c4b4b977abe146;hp=3083abc0f08e2bc4cdef27e55514645d267fa223;hb=4f7c4a9fe4fd2332dd2a748b17171f9d45129e4f;hpb=b05f4291bec38d550b98e45a9e6f2320403905d3

diff --git a/indirect.xs b/indirect.xs
index 3083abc..3d901d0 100644
--- a/indirect.xs
+++ b/indirect.xs
@@ -638,6 +638,68 @@ static void indirect_map_delete(pTHX_ const OP *o) {
   ptable_delete(MY_CXT.map, o);
 }
 
+/* --- Safe version of call_sv() ------------------------------------------- */
+
+static I32 indirect_call_sv(pTHX_ SV *sv, I32 flags) {
+#define indirect_call_sv(S, F) indirect_call_sv(aTHX_ (S), (F))
+ I32          ret, cxix;
+ PERL_CONTEXT saved_cx;
+ SV          *saved_errsv = NULL;
+
+ if (SvTRUE(ERRSV)) {
+  if (IN_PERL_COMPILETIME && PL_errors)
+   sv_catsv(PL_errors, ERRSV);
+  else
+   saved_errsv = newSVsv(ERRSV);
+  SvCUR_set(ERRSV, 0);
+ }
+
+ cxix     = (cxstack_ix < cxstack_max) ? (cxstack_ix + 1) : Perl_cxinc(aTHX);
+ /* The last popped context will be reused by call_sv(), but our callers may
+  * still need its previous value. Back it up so that it isn't clobbered. */
+ saved_cx = cxstack[cxix];
+
+ ret = call_sv(sv, flags | G_EVAL);
+
+ cxstack[cxix] = saved_cx;
+
+ if (SvTRUE(ERRSV)) {
+  /* Discard the old ERRSV, and reuse the variable to temporarily store the
+   * new one. */
+  if (saved_errsv)
+   sv_setsv(saved_errsv, ERRSV);
+  else
+   saved_errsv = newSVsv(ERRSV);
+  SvCUR_set(ERRSV, 0);
+  /* Immediately flush all errors. */
+  if (IN_PERL_COMPILETIME) {
+#if I_HAS_PERL(5, 10, 0) || defined(PL_parser)
+   if (PL_parser)
+    ++PL_parser->error_count;
+#elif defined(PL_error_count)
+   ++PL_error_count;
+#else
+   ++PL_Ierror_count;
+#endif
+   if (PL_errors) {
+    sv_setsv(ERRSV, PL_errors);
+    SvCUR_set(PL_errors, 0);
+   }
+  }
+  sv_catsv(ERRSV, saved_errsv);
+  SvREFCNT_dec(saved_errsv);
+  croak(NULL);
+ } else if (saved_errsv) {
+  /* If IN_PERL_COMPILETIME && PL_errors, then the old ERRSV has already been
+   * added to PL_errors. Otherwise, just restore it to ERRSV, as if no eval
+   * block has ever been executed. */
+  sv_setsv(ERRSV, saved_errsv);
+  SvREFCNT_dec(saved_errsv);
+ }
+
+ return ret;
+}
+
 /* --- Check functions ----------------------------------------------------- */
 
 static int indirect_find(pTHX_ SV *name_sv, const char *line_bufptr, STRLEN *name_pos) {
@@ -995,7 +1057,7 @@ static OP *indirect_ck_entersub(pTHX_ OP *o) {
    mPUSHu(moi->line);
    PUTBACK;
 
-   call_sv(code, G_VOID);
+   indirect_call_sv(code, G_VOID);
 
    PUTBACK;