Fix breakages that prevended -DPERL_POISON from compiling.

p4raw-id: //depot/perl@26112

1 files changed, 9 insertions, 2 deletions

diff --git a/sv.h b/sv.h
index fc8729f634..99cfe5a7b2 100644
--- a/sv.h
+++ b/sv.h
@@ -896,10 +896,17 @@ in gv.h: */
 #  endif
 #endif
 
+#ifndef PERL_POISON
 /* Given that these two are new, there can't be any existing code using them
  *  as LVALUEs  */
-#define SvPVX_mutable(sv)	(0 + (sv)->sv_u.svu_pv)
-#define SvPVX_const(sv)		((const char*)(0 + (sv)->sv_u.svu_pv))
+#  define SvPVX_mutable(sv)	(0 + (sv)->sv_u.svu_pv)
+#  define SvPVX_const(sv)	((const char*)(0 + (sv)->sv_u.svu_pv))
+#else
+/* Except for the poison code, which uses & to scribble over the pointer after
+   free() is called.  */
+#  define SvPVX_mutable(sv)	((sv)->sv_u.svu_pv)
+#  define SvPVX_const(sv)	((const char*)((sv)->sv_u.svu_pv))
+#endif
 
 #define SvIVXx(sv) SvIVX(sv)
 #define SvUVXx(sv) SvUVX(sv)