From: matthewt <matthewt@bd8105ee-0ff8-0310-8827-fb3f25b6796d>
Date: Tue, 3 Jun 2008 15:02:01 +0000 (+0000)
Subject: fix the fucking segfault
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=d5371dd8e5b4189cc4364cd98917ff3a60512354;p=p5sagit%2FDevel-Declare.git

fix the fucking segfault

git-svn-id: http://dev.catalyst.perl.org/repos/bast/trunk/Devel-Declare@4460 bd8105ee-0ff8-0310-8827-fb3f25b6796d
---

diff --git a/Changes b/Changes
index f3f8bc0..6df7ec1 100644
--- a/Changes
+++ b/Changes
@@ -1,5 +1,6 @@
 Changes for Devel-Declare
 
+  - only mangle evals if o->op_ppaddr is actually PL_ppaddr[OP_ENTERVAL]
   - don't set OPf_SPECIAL on entereval ops, mistaken cargo cult from autobox
   - fix traits code to work on older 5.8.x perls
 
diff --git a/Declare.xs b/Declare.xs
index ade77c8..1fa8897 100644
--- a/Declare.xs
+++ b/Declare.xs
@@ -296,7 +296,8 @@ OP* dd_pp_entereval(pTHX) {
 
 STATIC OP *dd_ck_entereval(pTHX_ OP *o) {
   o = dd_old_ck_entereval(aTHX_ o); /* let the original do its job */
-  o->op_ppaddr = dd_pp_entereval;
+  if (o->op_ppaddr == PL_ppaddr[OP_ENTEREVAL])
+    o->op_ppaddr = dd_pp_entereval;
   return o;
 }