diff options
| author | dcs <dcs@FreeBSD.org> | 1999-02-22 13:12:37 +0000 |
|---|---|---|
| committer | dcs <dcs@FreeBSD.org> | 1999-02-22 13:12:37 +0000 |
| commit | 3b2e9c970d1b3c4670c145d0363db0fabc8ee122 (patch) | |
| tree | 332b8d8aa02a493f27ddc9da58ee8b7fc486242d /sys/boot/common/interp.c | |
| parent | 62572be175c190ab32f7db9990d3169dd1883b83 (diff) | |
| download | FreeBSD-src-3b2e9c970d1b3c4670c145d0363db0fabc8ee122.zip FreeBSD-src-3b2e9c970d1b3c4670c145d0363db0fabc8ee122.tar.gz | |
Fix assorted memory leak/buffer reuse problems.
Not restricted to, but including:
PR: kern/9631
Submitted by: Bill Fenner <fenner@parc.xerox.com>
Diffstat (limited to 'sys/boot/common/interp.c')
| -rw-r--r-- | sys/boot/common/interp.c | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/sys/boot/common/interp.c b/sys/boot/common/interp.c index 276548c..cc7f6ff 100644 --- a/sys/boot/common/interp.c +++ b/sys/boot/common/interp.c @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: interp.c,v 1.13 1999/01/22 23:50:13 msmith Exp $ + * $Id: interp.c,v 1.14 1999/02/04 17:06:46 dcs Exp $ */ /* * Simple commandline interpreter, toplevel and misc. @@ -148,10 +148,23 @@ command_include(int argc, char *argv[]) { int i; int res; + char **argvbuf; + + /* + * Since argv is static, we need to save it here. + */ + argvbuf = (char**) calloc(argc, sizeof(char*)); + for (i = 0; i < argc; i++) + argvbuf[i] = strdup(argv[i]); res=CMD_OK; for (i = 1; (i < argc) && (res == CMD_OK); i++) - res = include(argv[i]); + res = include(argvbuf[i]); + + for (i = 0; i < argc; i++) + free(argvbuf[i]); + free(argvbuf); + return(res); } @@ -243,7 +256,7 @@ include(char *filename) #ifdef BOOT_FORTH res = bf_run(sp->text); if (res != VM_OUTOFTEXT) { - sprintf(command_errbuf, "Error while including %s:\n%s", filename, sp->text); + sprintf(command_errbuf, "Error while including %s, in the line:\n%s", filename, sp->text); res = CMD_ERROR; break; } else |
