croak if reallocation occurs during scan_str

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

diff --git a/Declare.xs b/Declare.xs
index b11d65d..41a991b 100644 (file)
--- a/Declare.xs
+++ b/Declare.xs
@@ -26,9 +26,15 @@ static int dd_debug = 0;
 
 #define DD_CONST_VIA_RV2CV PERL_VERSION_GE(5,11,2)
 
+#define DD_GROW_VIA_BLOCKHOOK PERL_VERSION_GE(5,13,3)
+
 #define LEX_NORMAL    10
 #define LEX_INTERPNORMAL   9
 
+/* please try not to have a line longer than this :) */
+
+#define DD_PREFERRED_LINESTR_SIZE 16384
+
 /* flag to trigger removal of temporary declaree sub */
 
 static int in_declare = 0;
@@ -212,10 +218,14 @@ int dd_toke_scan_ident(pTHX_ int offset) {
 }
 
 int dd_toke_scan_str(pTHX_ int offset) {
+  char* old_pvx = SvPVX(PL_linestr);
   STRLEN remaining = sv_len(PL_linestr) - offset;
   SV* line_copy = newSVsv(PL_linestr);
   char* base_s = SvPVX(PL_linestr) + offset;
   char* s = scan_str(base_s, FALSE, FALSE);
+  if(SvPVX(PL_linestr) != old_pvx)
+    croak("PL_linestr reallocated during scan_str, "
+      "Devel::Declare can't continue");
   if (s != base_s && sv_len(PL_lex_stuff) > remaining) {
     int ret = (s - SvPVX(PL_linestr)) + remaining;
     sv_catsv(line_copy, PL_linestr);
@@ -227,8 +237,12 @@ int dd_toke_scan_str(pTHX_ int offset) {
 }
 
 int dd_toke_skipspace(pTHX_ int offset) {
+  char* old_pvx = SvPVX(PL_linestr);
   char* base_s = SvPVX(PL_linestr) + offset;
   char* s = skipspace_force(base_s);
+  if(SvPVX(PL_linestr) != old_pvx)
+    croak("PL_linestr reallocated during skipspace, "
+      "Devel::Declare can't continue");
   return s - base_s;
 }
 
@@ -272,6 +286,9 @@ STATIC OP *dd_ck_rv2cv(pTHX_ OP *o, void *user_data) {
 
   PERL_UNUSED_VAR(user_data);
 
+  if (!DD_AM_LEXING)
+    return o; /* not lexing? */
+
   if (in_declare) {
     call_done_declare(aTHX);
     return o;
@@ -282,9 +299,6 @@ STATIC OP *dd_ck_rv2cv(pTHX_ OP *o, void *user_data) {
   if (kid->op_type != OP_GV) /* not a GV so ignore */
     return o;
 
-  if (!DD_AM_LEXING)
-    return o; /* not lexing? */
-
   if (DD_DEBUG_TRACE) {
     printf("Checking GV %s -> %s\n", HvNAME(GvSTASH(kGVOP_gv)), GvNAME(kGVOP_gv));
   }
@@ -322,6 +336,17 @@ STATIC OP *dd_ck_rv2cv(pTHX_ OP *o, void *user_data) {
   return o;
 }
 
+#if DD_GROW_VIA_BLOCKHOOK
+
+static void dd_block_start(pTHX_ int full)
+{
+  PERL_UNUSED_VAR(full);
+  if (SvLEN(PL_linestr) < DD_PREFERRED_LINESTR_SIZE)
+    (void) lex_grow_linestr(DD_PREFERRED_LINESTR_SIZE);
+}
+
+#else /* !DD_GROW_VIA_BLOCKHOOK */
+
 OP* dd_pp_entereval(pTHX) {
   dSP;
   STRLEN len;
@@ -347,7 +372,7 @@ OP* dd_pp_entereval(pTHX) {
         sv = sv_2mortal(newSVsv(sv));
       sv_catpvn(sv, "\n;", 2);
     }
-    SvGROW(sv, 8192);
+    SvGROW(sv, DD_PREFERRED_LINESTR_SIZE);
   }
   PUSHs(sv);
 #ifdef PERL_5_9_PLUS
@@ -366,10 +391,12 @@ STATIC OP *dd_ck_entereval(pTHX_ OP *o, void *user_data) {
   return o;
 }
 
+#endif /* !DD_GROW_VIA_BLOCKHOOK */
+
 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 :) */
+  SvGROW(sv, DD_PREFERRED_LINESTR_SIZE);
   /* filter_del(dd_filter_realloc); */
   return count;
 }
@@ -469,8 +496,18 @@ void
 setup()
   CODE:
   if (!initialized++) {
-    hook_op_check(OP_RV2CV, dd_ck_rv2cv, NULL);
+#if DD_GROW_VIA_BLOCKHOOK
+    static BHK bhk;
+#if PERL_VERSION_GE(5,13,6)
+    BhkENTRY_set(&bhk, bhk_start, dd_block_start);
+#else /* <5.13.6 */
+    BhkENTRY_set(&bhk, start, dd_block_start);
+#endif /* <5.13.6 */
+    Perl_blockhook_register(aTHX_ &bhk);
+#else /* !DD_GROW_VIA_BLOCKHOOK */
     hook_op_check(OP_ENTEREVAL, dd_ck_entereval, NULL);
+#endif /* !DD_GROW_VIA_BLOCKHOOK */
+    hook_op_check(OP_RV2CV, dd_ck_rv2cv, NULL);
 #if !DD_CONST_VIA_RV2CV
     hook_op_check(OP_CONST, dd_ck_const, NULL);
 #endif /* !DD_CONST_VIA_RV2CV */