X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Declare.xs;h=65902ff6123d14d77c2099703f0f3fbbf3044e0c;hb=8449c31f7eddd7fab1ed222bb554e57f4b850768;hp=e36668dd67c01845e5ad955d5475b05ec1e03699;hpb=78bb475dd0c334ce6f507f501d7b9e1d8cbd8b0b;p=p5sagit%2FDevel-Declare.git

diff --git a/Declare.xs b/Declare.xs
index e36668d..65902ff 100644
--- a/Declare.xs
+++ b/Declare.xs
@@ -225,6 +225,8 @@ int dd_toke_scan_str(pTHX_ int offset) {
   if(SvPVX(PL_linestr) != old_pvx)
     croak("PL_linestr reallocated during scan_str, "
       "Devel::Declare can't continue");
+  if (!s)
+    return 0;
   if (s <= base_s) {
     s += SvCUR(line_copy);
     sv_catsv(line_copy, PL_linestr);
@@ -563,10 +565,13 @@ toke_move_past_token(int offset);
   OUTPUT:
     RETVAL
 
-int
+SV*
 toke_scan_str(int offset);
+  PREINIT:
+    int len;
   CODE:
-    RETVAL = dd_toke_scan_str(aTHX_ offset);
+    len = dd_toke_scan_str(aTHX_ offset);
+    RETVAL = len ? newSViv(len) : &PL_sv_undef;
   OUTPUT:
     RETVAL