X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=Upper.xs;h=60b42778de14e6dfd4e87b7f88fe0710530c0c72;hb=73bda6730e64ae835f07954ad37ca1b19d8ec002;hp=d78c722b3a36a0ba4ac33824d708d7f1ada398b5;hpb=d9a0dbbfd5e7ec3408a7590705e08cf98e273b6e;p=perl%2Fmodules%2FScope-Upper.git

diff --git a/Upper.xs b/Upper.xs
index d78c722..60b4277 100644
--- a/Upper.xs
+++ b/Upper.xs
@@ -402,6 +402,13 @@ typedef struct {
  svtype type;
 } su_ud_localize;
 
+#define SU_UD_LOCALIZE_FREE(U) STMT_START { \
+ SvREFCNT_dec((U)->elem); \
+ SvREFCNT_dec((U)->val);  \
+ SvREFCNT_dec((U)->sv);   \
+ SU_UD_FREE(U);           \
+} STMT_END
+
 STATIC I32 su_ud_localize_init(pTHX_ su_ud_localize *ud, SV *sv, SV *val, SV *elem) {
 #define su_ud_localize_init(UD, S, V, E) su_ud_localize_init(aTHX_ (UD), (S), (V), (E))
  UV deref = 0;
@@ -546,10 +553,7 @@ STATIC void su_localize(pTHX_ void *ud_) {
   SvSetMagicSV((SV *) gv, val);
 
 done:
- SvREFCNT_dec(ud->elem);
- SvREFCNT_dec(ud->val);
- SvREFCNT_dec(ud->sv);
- SU_UD_FREE(ud);
+ SU_UD_LOCALIZE_FREE(ud);
 }
 
 /* --- Pop a context back -------------------------------------------------- */
@@ -1080,7 +1084,7 @@ CODE:
  SU_UD_HANDLER(ud) = su_localize;
  size = su_ud_localize_init(ud, sv, val, elem);
  if (ud->type != SVt_PVAV && ud->type != SVt_PVHV) {
-  Safefree(ud);
+  SU_UD_LOCALIZE_FREE(ud);
   croak("Can't localize an element of something that isn't an array or a hash");
  }
  su_init(cxix, ud, size);