diff options
| author | Chip Salzenberg <chip@perl.com> | 1997-04-25 13:55:09 +1200 |
|---|---|---|
| committer | Chip Salzenberg <chip@atlantic.net> | 1997-05-01 00:00:00 +1200 |
| commit | a1f49e722e7e3f3a14f81e8dd51de229003f2378 (patch) | |
| tree | ce31d173ec7b018589e09f42b2c86177bddf2cc1 /pp_ctl.c | |
| parent | 1d5db3267290eb95285de2427e6b4f4c072cc986 (diff) | |
| download | perl-a1f49e722e7e3f3a14f81e8dd51de229003f2378.tar.gz | |
Handle tainted values in lists returned from subs, evals
Diffstat (limited to 'pp_ctl.c')
| -rw-r--r-- | pp_ctl.c | 35 |
1 files changed, 26 insertions, 9 deletions
@@ -1316,6 +1316,7 @@ PP(pp_leaveloop) mark = newsp; POPLOOP1(cx); /* Delay POPLOOP2 until stack values are safe */ + TAINT_NOT; if (gimme == G_VOID) ; /* do nothing */ else if (gimme == G_SCALAR) { @@ -1325,8 +1326,10 @@ PP(pp_leaveloop) *++newsp = &sv_undef; } else { - while (mark < SP) + while (mark < SP) { *++newsp = sv_mortalcopy(*++mark); + TAINT_NOT; /* Each item is independent */ + } } SP = newsp; PUTBACK; @@ -1389,6 +1392,7 @@ PP(pp_return) DIE("panic: return"); } + TAINT_NOT; if (gimme == G_SCALAR) { if (MARK < SP) *++newsp = (popsub2 && SvTEMP(*SP)) @@ -1397,9 +1401,11 @@ PP(pp_return) *++newsp = &sv_undef; } else if (gimme == G_ARRAY) { - while (++MARK <= SP) + while (++MARK <= SP) { *++newsp = (popsub2 && SvTEMP(*MARK)) ? *MARK : sv_mortalcopy(*MARK); + TAINT_NOT; /* Each item is independent */ + } } stack_sp = newsp; @@ -1461,6 +1467,7 @@ PP(pp_last) DIE("panic: last"); } + TAINT_NOT; if (gimme == G_SCALAR) { if (MARK < SP) *++newsp = ((pop2 == CXt_SUB) && SvTEMP(*SP)) @@ -1469,9 +1476,11 @@ PP(pp_last) *++newsp = &sv_undef; } else if (gimme == G_ARRAY) { - while (++MARK <= SP) + while (++MARK <= SP) { *++newsp = ((pop2 == CXt_SUB) && SvTEMP(*MARK)) ? *MARK : sv_mortalcopy(*MARK); + TAINT_NOT; /* Each item is independent */ + } } SP = newsp; PUTBACK; @@ -2326,6 +2335,7 @@ PP(pp_leaveeval) POPEVAL(cx); retop = pop_return(); + TAINT_NOT; if (gimme == G_VOID) MARK = newsp; else if (gimme == G_SCALAR) { @@ -2342,10 +2352,13 @@ PP(pp_leaveeval) } } else { - for (mark = newsp + 1; mark <= SP; mark++) - if (!(SvFLAGS(*mark) & SVs_TEMP)) + /* in case LEAVE wipes old return values */ + for (mark = newsp + 1; mark <= SP; mark++) { + if (!(SvFLAGS(*mark) & SVs_TEMP)) { *mark = sv_mortalcopy(*mark); - /* in case LEAVE wipes old return values */ + TAINT_NOT; /* Each item is independent */ + } + } } curpm = newpm; /* Don't pop $1 et al till now */ @@ -2406,6 +2419,7 @@ PP(pp_leavetry) POPEVAL(cx); pop_return(); + TAINT_NOT; if (gimme == G_VOID) SP = newsp; else if (gimme == G_SCALAR) { @@ -2423,10 +2437,13 @@ PP(pp_leavetry) SP = MARK; } else { - for (mark = newsp + 1; mark <= SP; mark++) - if (!(SvFLAGS(*mark) & (SVs_PADTMP|SVs_TEMP))) + /* in case LEAVE wipes old return values */ + for (mark = newsp + 1; mark <= SP; mark++) { + if (!(SvFLAGS(*mark) & (SVs_PADTMP|SVs_TEMP))) { *mark = sv_mortalcopy(*mark); - /* in case LEAVE wipes old return values */ + TAINT_NOT; /* Each item is independent */ + } + } } curpm = newpm; /* Don't pop $1 et al till now */ |