mirror of
https://github.com/tmate-io/tmate.git
synced 2024-11-27 02:23:15 +01:00
Sync OpenBSD patchset 299:
Initialise the arg2 pointer properly (also free it when freeing the others). Fixes crashes with J in malloc_options reported by oga.
This commit is contained in:
parent
83e44c7d8e
commit
d15e88cb68
@ -1,4 +1,4 @@
|
||||
/* $Id: cmd-generic.c,v 1.33 2009-08-11 14:42:59 nicm Exp $ */
|
||||
/* $Id: cmd-generic.c,v 1.34 2009-08-26 22:13:52 tcunha Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
|
||||
@ -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);
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user