X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=Magic.xs;h=2883f000dc47dc5cebbbee796668d8a32887dd54;hb=94588233679372bb8f4e71127893256329013871;hp=e25d8d1566ed92cd1aa79a2a212206d5fbeb9445;hpb=18249a13e0630dd85dfb70ec9190eb18280fb7c0;p=perl%2Fmodules%2FVariable-Magic.git

diff --git a/Magic.xs b/Magic.xs
index e25d8d1..2883f00 100644
--- a/Magic.xs
+++ b/Magic.xs
@@ -548,6 +548,12 @@ STATIC int vmg_svt_clear(pTHX_ SV *sv, MAGIC *mg) {
 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);
@@ -882,7 +888,7 @@ CODE:
   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;