diff options
| author | ru <ru@FreeBSD.org> | 2004-02-08 21:32:21 +0000 |
|---|---|---|
| committer | ru <ru@FreeBSD.org> | 2004-02-08 21:32:21 +0000 |
| commit | 90fe2c86f7f5001762e4c3af00a323f801d8b737 (patch) | |
| tree | a4aeceb1822c31fd30a3fff6c51686bbbbbed3de /contrib/one-true-awk/run.c | |
| parent | a1d941195d09954508ee356f30d7989bb1d426c4 (diff) | |
| download | FreeBSD-src-90fe2c86f7f5001762e4c3af00a323f801d8b737.zip FreeBSD-src-90fe2c86f7f5001762e4c3af00a323f801d8b737.tar.gz | |
Vendor import of bwk's 7-Feb-2004 release.
Diffstat (limited to 'contrib/one-true-awk/run.c')
| -rw-r--r-- | contrib/one-true-awk/run.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/contrib/one-true-awk/run.c b/contrib/one-true-awk/run.c index 066cb01..4648c83 100644 --- a/contrib/one-true-awk/run.c +++ b/contrib/one-true-awk/run.c @@ -219,6 +219,7 @@ Cell *call(Node **a, int n) /* function call. very kludgy and fragile */ { static Cell newcopycell = { OCELL, CCOPY, 0, "", 0.0, NUM|STR|DONTFREE }; int i, ncall, ndef; + int freed = 0; /* handles potential double freeing when fcn & param share a tempcell */ Node *x; Cell *args[NARGS], *oargs[NARGS]; /* BUG: fixed size arrays */ Cell *y, *z, *fcn; @@ -296,12 +297,18 @@ Cell *call(Node **a, int n) /* function call. very kludgy and fragile */ } else if (t != y) { /* kludge to prevent freeing twice */ t->csub = CTEMP; tempfree(t); + } else if (t == y && t->csub == CCOPY) { + t->csub = CTEMP; + tempfree(t); + freed = 1; } } tempfree(fcn); if (isexit(y) || isnext(y)) return y; - tempfree(y); /* this can free twice! */ + if (freed == 0) { + tempfree(y); /* don't free twice! */ + } z = fp->retval; /* return value */ dprintf( ("%s returns %g |%s| %o\n", s, getfval(z), getsval(z), z->tval) ); fp--; |
