summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHugo van der Sanden <hv@crypt.org>2002-09-03 15:34:20 +0100
committerhv <hv@crypt.org>2002-09-04 13:23:17 +0000
commitb8f55b69fbd0df7045f7d14d66b22d94744f42c5 (patch)
treec2817ea4610fac1417bcfc43093cf54c0b306e97
parentf531d6eefef19d477e3a272a6e2b1422427ebde0 (diff)
downloadperl-b8f55b69fbd0df7045f7d14d66b22d94744f42c5.tar.gz
fix coredump after 64k-deep recursion
Subject: Re: debugging coredump with -DD Message-Id: <200209031334.g83DYLN09709@crypt.compulink.co.uk> p4raw-id: //depot/perl@17835
-rw-r--r--cop.h4
-rwxr-xr-xt/op/recurse.t11
2 files changed, 9 insertions, 6 deletions
diff --git a/cop.h b/cop.h
index 81733e97bd..0732a040ef 100644
--- a/cop.h
+++ b/cop.h
@@ -111,7 +111,7 @@ struct block_sub {
AV * savearray;
#endif /* USE_5005THREADS */
AV * argarray;
- U16 olddepth;
+ long olddepth;
U8 hasargs;
U8 lval; /* XXX merge lval and hasargs? */
SV ** oldcurpad;
@@ -119,7 +119,7 @@ struct block_sub {
#define PUSHSUB(cx) \
cx->blk_sub.cv = cv; \
- cx->blk_sub.olddepth = (U16)CvDEPTH(cv); \
+ cx->blk_sub.olddepth = CvDEPTH(cv); \
cx->blk_sub.hasargs = hasargs; \
cx->blk_sub.lval = PL_op->op_private & \
(OPpLVAL_INTRO|OPpENTERSUB_INARGS);
diff --git a/t/op/recurse.t b/t/op/recurse.t
index 374813c9e4..9d0064068b 100755
--- a/t/op/recurse.t
+++ b/t/op/recurse.t
@@ -8,7 +8,7 @@ BEGIN {
chdir 't' if -d 't';
@INC = qw(. ../lib);
require "test.pl";
- plan(tests => 26);
+ plan(tests => 28);
}
use strict;
@@ -112,6 +112,9 @@ is(takeuchi($x, $y, $z), $z + 1, "takeuchi($x, $y, $z) == $z + 1");
is(sillysum(1000), 1000*1001/2, "recursive sum of 1..1000");
}
-
-
-
+# check ok for recursion depth > 65536
+is(runperl(
+ nolib => 1,
+ prog => q{$d=0; $e=1; sub c { ++$d; if ($d > 66000) { $e=0 } else { c(); c() unless $d % 32768 } --$d } c(); exit $e},
+), '', "64K deep recursion - no output expected");
+is($?, 0, "64K deep recursion - no coredump expected");