fix the fucking segfault

[p5sagit/Devel-Declare.git] / Declare.xs

diff --git a/Declare.xs b/Declare.xs
index db6437b..1fa8897 100644 (file)
--- a/Declare.xs
+++ b/Declare.xs
@@ -29,7 +29,7 @@
 /* placeholders for PL_check entries we wrap */
 
 STATIC OP *(*dd_old_ck_rv2cv)(pTHX_ OP *op);
-STATIC OP *(*dd_old_ck_lineseq)(pTHX_ OP *op);
+STATIC OP *(*dd_old_ck_entereval)(pTHX_ OP *op);
 
 /* flag to trigger removal of temporary declaree sub */
 
@@ -60,8 +60,22 @@ STATIC OP *dd_ck_rv2cv(pTHX_ OP *o) {
 
   if (in_declare) {
     cb_args[0] = NULL;
+#ifdef DD_DEBUG
+    printf("Deconstructing declare\n");
+    printf("PL_bufptr: %s\n", PL_bufptr);
+    printf("bufend at: %i\n", PL_bufend - PL_bufptr);
+    printf("linestr: %s\n", SvPVX(PL_linestr));
+    printf("linestr len: %i\n", PL_bufend - SvPVX(PL_linestr));
+#endif
     call_argv("Devel::Declare::done_declare", G_VOID|G_DISCARD, cb_args);
     in_declare--;
+#ifdef DD_DEBUG
+    printf("PL_bufptr: %s\n", PL_bufptr);
+    printf("bufend at: %i\n", PL_bufend - PL_bufptr);
+    printf("linestr: %s\n", SvPVX(PL_linestr));
+    printf("linestr len: %i\n", PL_bufend - SvPVX(PL_linestr));
+    printf("actual len: %i\n", strlen(PL_bufptr));
+#endif
     return o;
   }
 
@@ -164,7 +178,7 @@ STATIC OP *dd_ck_rv2cv(pTHX_ OP *o) {
           while (*s && *s != '{') ++s;
           if (*s) {
               int tlen = s - traitstart;
-              Newx(found_traits, tlen+1, char);
+              New(0, found_traits, tlen+1, char);
               Copy(traitstart, found_traits, tlen, char);
               found_traits[tlen] = 0;
 #ifdef DD_DEBUG
@@ -227,21 +241,27 @@ STATIC OP *dd_ck_rv2cv(pTHX_ OP *o) {
     retstr = POPpx;
     PUTBACK;
     if (retstr && strlen(retstr)) {
+      const char* old_start = SvPVX(PL_linestr);
+      int start_diff;
       const int old_len = SvCUR(PL_linestr);
 #ifdef DD_DEBUG
       printf("Got string %s\n", retstr);
-      printf("retstr len: %d, old_len %d\n", strlen(retstr), old_len);
 #endif
       SvGROW(PL_linestr, (STRLEN)(old_len + strlen(retstr)));
+      if (start_diff = SvPVX(PL_linestr) - old_start) {
+        Perl_croak(aTHX_ "forced to realloc PL_linestr for line %s, bailing out before we crash harder", SvPVX(PL_linestr));
+      }
       memmove(s+strlen(retstr), s, (PL_bufend - s)+1);
       memmove(s, retstr, strlen(retstr));
       SvCUR_set(PL_linestr, old_len + strlen(retstr));
       PL_bufend += strlen(retstr);
 #ifdef DD_DEBUG
   printf("cur buf: %s\n", s);
+  printf("PL_bufptr: %s\n", PL_bufptr);
   printf("bufend at: %i\n", PL_bufend - s);
   printf("linestr: %s\n", SvPVX(PL_linestr));
   printf("linestr len: %i\n", PL_bufend - SvPVX(PL_linestr));
+  printf("tokenbuf now: %s\n", PL_tokenbuf);
 #endif
     }
   } else {
@@ -250,37 +270,45 @@ STATIC OP *dd_ck_rv2cv(pTHX_ OP *o) {
   return o;
 }
 
-STATIC OP *dd_ck_lineseq(pTHX_ OP *o) {
-  AV* pad_inject_list;
-  SV** to_inject_ref;
-  int i, pad_inject_list_last;
-
-  o = dd_old_ck_lineseq(aTHX_ o);
-
-  pad_inject_list = get_av("Devel::Declare::next_pad_inject", FALSE);
-  if (!pad_inject_list)
-    return o;
-
-  pad_inject_list_last = av_len(pad_inject_list);
-
-  if (pad_inject_list_last == -1)
-    return o;
-
-  for (i = 0; i <= pad_inject_list_last; i++) {
-    to_inject_ref = av_fetch(pad_inject_list, i, FALSE);
-    if (to_inject_ref && SvPOK(*to_inject_ref)) {
+OP* dd_pp_entereval(pTHX) {
+  dSP;
+  dPOPss;
+  STRLEN len;
+  const char* s;
+  if (SvPOK(sv)) {
 #ifdef DD_DEBUG
-  printf("Injecting %s into pad\n", SvPVX(*to_inject_ref));
+    printf("mangling eval sv\n");
 #endif
-      allocmy(SvPVX(*to_inject_ref));
+    if (SvREADONLY(sv))
+      sv = sv_2mortal(newSVsv(sv));
+    s = SvPVX(sv);
+    len = SvCUR(sv);
+    if (!len || s[len-1] != ';') {
+      if (!(SvFLAGS(sv) & SVs_TEMP))
+        sv = sv_2mortal(newSVsv(sv));
+      sv_catpvn(sv, "\n;", 2);
     }
+    SvGROW(sv, 8192);
   }
+  PUSHs(sv);
+  return PL_ppaddr[OP_ENTEREVAL](aTHX);
+}
 
-  av_clear(pad_inject_list);
-
+STATIC OP *dd_ck_entereval(pTHX_ OP *o) {
+  o = dd_old_ck_entereval(aTHX_ o); /* let the original do its job */
+  if (o->op_ppaddr == PL_ppaddr[OP_ENTEREVAL])
+    o->op_ppaddr = dd_pp_entereval;
   return o;
 }
 
+static I32 dd_filter_realloc(pTHX_ int idx, SV *sv, int maxlen)
+{
+  const I32 count = FILTER_READ(idx+1, sv, maxlen);
+  SvGROW(sv, 8192); /* please try not to have a line longer than this :) */
+  /* filter_del(dd_filter_realloc); */
+  return count;
+}
+
 static int initialized = 0;
 
 MODULE = Devel::Declare  PACKAGE = Devel::Declare
@@ -293,15 +321,7 @@ setup()
   if (!initialized++) {
     dd_old_ck_rv2cv = PL_check[OP_RV2CV];
     PL_check[OP_RV2CV] = dd_ck_rv2cv;
-    dd_old_ck_lineseq = PL_check[OP_LINESEQ];
-    PL_check[OP_LINESEQ] = dd_ck_lineseq;
-  }
-
-void
-teardown()
-  CODE:
-  /* ensure we only uninit when number of teardown calls matches 
-     number of setup calls */
-  if (initialized && !--initialized) {
-    PL_check[OP_RV2CV] = dd_old_ck_rv2cv;
+    dd_old_ck_entereval = PL_check[OP_ENTEREVAL];
+    PL_check[OP_ENTEREVAL] = dd_ck_entereval;
   }
+  filter_add(dd_filter_realloc, NULL);