diff options
| author | Nicholas Marriott <nicm@openbsd.org> | 2009-08-26 18:09:52 +0000 |
|---|---|---|
| committer | Nicholas Marriott <nicm@openbsd.org> | 2009-08-26 18:09:52 +0000 |
| commit | 2e5b3ab8bc0e0f7a36f7a901263fa720654d60ca (patch) | |
| tree | 6be8e0ab92a14bad082dbe25d31a58c9c4bc707d /cmd-generic.c | |
| parent | ddf97f8289df9c7973e7dad6dae8949e29792a16 (diff) | |
Initialise the arg2 pointer properly (also free it when freeing the
others). Fixes crashes with J in malloc_options reported by oga.
Diffstat (limited to 'cmd-generic.c')
| -rw-r--r-- | cmd-generic.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/cmd-generic.c b/cmd-generic.c index 7962a87a..89dc2e25 100644 --- a/cmd-generic.c +++ b/cmd-generic.c @@ -155,6 +155,7 @@ cmd_target_init(struct cmd *self, unused int key) data->chflags = 0; data->target = NULL; data->arg = NULL; + data->arg2 = NULL; } int @@ -204,6 +205,8 @@ cmd_target_free(struct cmd *self) xfree(data->target); if (data->arg != NULL) xfree(data->arg); + if (data->arg2 != NULL) + xfree(data->arg2); xfree(data); } @@ -236,6 +239,7 @@ cmd_srcdst_init(struct cmd *self, unused int key) data->src = NULL; data->dst = NULL; data->arg = NULL; + data->arg2 = NULL; } int @@ -290,6 +294,8 @@ cmd_srcdst_free(struct cmd *self) xfree(data->dst); if (data->arg != NULL) xfree(data->arg); + if (data->arg2 != NULL) + xfree(data->arg2); xfree(data); } @@ -324,6 +330,7 @@ cmd_buffer_init(struct cmd *self, unused int key) data->target = NULL; data->buffer = -1; data->arg = NULL; + data->arg2 = NULL; } int @@ -384,6 +391,8 @@ cmd_buffer_free(struct cmd *self) xfree(data->target); if (data->arg != NULL) xfree(data->arg); + if (data->arg2 != NULL) + xfree(data->arg2); xfree(data); } |