# define dNOOP
#endif
-#if defined(MULTIPLICITY) || defined(PERL_IMPLICIT_CONTEXT)
-# define VMG_MULTIPLICITY 1
-# ifndef tTHX
-# define tTHX PerlInterpreter*
+#ifndef VMG_MULTIPLICITY
+# if defined(MULTIPLICITY) || defined(PERL_IMPLICIT_CONTEXT)
+# define VMG_MULTIPLICITY 1
+# else
+# define VMG_MULTIPLICITY 0
# endif
-#else
-# define VMG_MULTIPLICITY 0
+#endif
+#if VMG_MULTIPLICITY && !defined(tTHX)
+# define tTHX PerlInterpreter*
#endif
-#if VMG_MULTIPLICITY && defined(dMY_CXT) && defined(MY_CXT) && defined(START_MY_CXT) && defined(MY_CXT_INIT) && (defined(MY_CXT_CLONE) || defined(dMY_CXT_SV))
+#if VMG_MULTIPLICITY && defined(USE_ITHREADS) && defined(dMY_CXT) && defined(MY_CXT) && defined(START_MY_CXT) && defined(MY_CXT_INIT) && (defined(MY_CXT_CLONE) || defined(dMY_CXT_SV))
# define VMG_THREADSAFE 1
# ifndef MY_CXT_CLONE
# define MY_CXT_CLONE \
# define MY_CXT_CLONE NOOP
#endif
-#if VMG_MULTIPLICITY
+#if VMG_THREADSAFE
STATIC SV *vmg_clone(pTHX_ SV *sv, tTHX owner) {
#define vmg_clone(P, O) vmg_clone(aTHX_ (P), (O))
return sv_dup(sv, ¶m);
}
-#endif /* VMG_MULTIPLICITY */
+#endif /* VMG_THREADSAFE */
/* --- Compatibility ------------------------------------------------------- */
if (w->cb_copy)
mg->mg_flags |= MGf_COPY;
#endif /* MGf_COPY */
-#if MGf_DUP
+#if 0 /* MGf_DUP */
if (w->cb_dup)
mg->mg_flags |= MGf_DUP;
#endif /* MGf_DUP */
STATIC int vmg_svt_free(pTHX_ SV *sv, MAGIC *mg) {
/* So that it can survive tmp cleanup in vmg_cb_call */
SvREFCNT_inc(sv);
+#if !VMG_HAS_PERL_AND(32686, 5, 11, 0)
+ /* The previous magic tokens were freed but the magic chain wasn't updated, so
+ * if you access the sv from the callback the old deleted magics will trigger
+ * and cause memory misreads. Change 32686 solved it that way : */
+ SvMAGIC_set(sv, mg);
+#endif
/* Perl_mg_free will get rid of the magic and decrement mg->mg_obj and
* mg->mg_ptr reference count */
return vmg_cb_call1(SV2MGWIZ(mg->mg_ptr)->cb_free, sv, mg->mg_obj);
w->owner = NULL;
#endif /* VMG_MULTIPLICITY */
- dMY_CXT;
- wiz = hv_delete(MY_CXT, buf, sprintf(buf, "%u", w->sig), 0);
+ {
+ dMY_CXT;
+ if (hv_delete(MY_CXT, buf, sprintf(buf, "%u", w->sig), 0) != wiz)
+ return 0;
+ }
SvFLAGS(wiz) |= SVf_BREAK;
FREETMPS;
#if MGf_COPY
if (w->cb_copy != NULL) { SvREFCNT_dec(SvRV(w->cb_copy)); }
#endif /* MGf_COPY */
-#if MGf_DUP
+#if 0 /* MGf_DUP */
if (w->cb_dup != NULL) { SvREFCNT_dec(SvRV(w->cb_dup)); }
#endif /* MGf_DUP */
#if MGf_LOCAL
croak(vmg_invalid_wiz);
}
- dMY_CXT;
-
- if (!hv_fetch(MY_CXT, buf, sprintf(buf, "%u", sig), 0))
- sig = 0;
-
+ {
+ dMY_CXT;
+ if (!hv_fetch(MY_CXT, buf, sprintf(buf, "%u", sig), 0))
+ sig = 0;
+ }
return sig;
}
croak(vmg_invalid_wiz);
}
- dMY_CXT;
-
- return (old = hv_fetch(MY_CXT, buf, sprintf(buf, "%u", sig), 0))
- ? *old : NULL;
+ {
+ dMY_CXT;
+ return (old = hv_fetch(MY_CXT, buf, sprintf(buf, "%u", sig), 0))
+ ? *old : NULL;
+ }
}
#define VMG_SET_CB(S, N) \
w->cb_ ## N = NULL; \
}
-#if VMG_MULTIPLICITY
+#if VMG_THREADSAFE
#define VMG_CLONE_CB(N) \
z->cb_ ## N = (w->cb_ ## N) ? newRV_noinc(vmg_clone(SvRV(w->cb_ ## N), \
return z;
}
-#endif /* VMG_MULTIPLICITY */
+#endif /* VMG_THREADSAFE */
/* --- XS ------------------------------------------------------------------ */
PROTOTYPE: DISABLE
PREINIT:
HV *hv;
- U16 count;
CODE:
#if VMG_THREADSAFE
{
hv = newHV();
hv_iterinit(hv); /* Allocate iterator */
hv_iterinit(MY_CXT);
- while (key = hv_iternext(MY_CXT)) {
+ while ((key = hv_iternext(MY_CXT))) {
STRLEN len;
char *sig = HePV(key, len);
SV *sv;
MAGIC *mg;
- MGWIZ *w;
sv = MGWIZ2SV(vmg_wizard_clone(SV2MGWIZ(HeVAL(key))));
mg = sv_magicext(sv, NULL, PERL_MAGIC_ext, &vmg_wizard_vtbl, NULL, 0);
mg->mg_private = SIG_WIZ;