diff options
| author | Dave Mitchell <davem@fdisolutions.com> | 2002-11-07 16:38:02 +0000 |
|---|---|---|
| committer | Rafael Garcia-Suarez <rgarciasuarez@gmail.com> | 2002-11-12 22:09:39 +0000 |
| commit | c5ab0850d11c51d3e7b48a5a420612220e590022 (patch) | |
| tree | d8675046ea3653664e987952ee9d40cddbf9ceeb /pad.h | |
| parent | fdd85a0336e53022f23038eaac184e017d9c5d61 (diff) | |
| download | perl-c5ab0850d11c51d3e7b48a5a420612220e590022.tar.gz | |
Re: threads and Win2000 (Smoke 18064 FAIL(F) MSWin32 5.0 W2000Pro)
Message-ID: <20021107163802.C25337@fdgroup.com>
p4raw-id: //depot/perl@18142
Diffstat (limited to 'pad.h')
| -rw-r--r-- | pad.h | 16 |
1 files changed, 9 insertions, 7 deletions
@@ -242,15 +242,17 @@ Clone the state variables associated with running and compiling pads. else \ (dstpad) = av_dup_inc((srcpad), param); -/* note - we set comp/curpad to null rather than duping - otherwise - * we may dup a pad but not the whole padlist, and be left with - * leaked pad. We assume that a sub will get called very soon hereafter - * and comp/curpad will get set to something sensible. DAPM 16-Oct02 */ -/* XXX DAPM -does the same logic appply to comppad_name ? */ +/* NB - we set PL_comppad to null unless it points at a value that + * has already been dup'ed, ie it points to part of an active padlist. + * Otherwise PL_comppad ends up being a leaked scalar in code like + * the following: + * threads->create(sub { threads->create(sub {...} ) } ); + * where the second thread dups the outer sub's comppad but not the + * sub's CV or padlist. */ #define PAD_CLONE_VARS(proto_perl, param) \ - PL_comppad = Null(PAD*); \ - PL_curpad = Null(SV **); \ + PL_comppad = ptr_table_fetch(PL_ptr_table, proto_perl->Icomppad); \ + PL_curpad = PL_comppad ? AvARRAY(PL_comppad) : Null(SV**); \ PL_comppad_name = av_dup(proto_perl->Icomppad_name, param); \ PL_comppad_name_fill = proto_perl->Icomppad_name_fill; \ PL_comppad_name_floor = proto_perl->Icomppad_name_floor; \ |