diff options
| author | Okan Demirmen <okan@cvs.openbsd.org> | 2012-11-07 20:37:56 +0000 |
|---|---|---|
| committer | Okan Demirmen <okan@cvs.openbsd.org> | 2012-11-07 20:37:56 +0000 |
| commit | 7316206d7bab40fbae7d194af391c52afefb0ecd (patch) | |
| tree | 40b3ae0e981dd76bdaf2728686349fa466107086 | |
| parent | dbf5a5de3a9b0236c52fc52715ae77413dce2fa4 (diff) | |
plug a leak when using 'unmap' for kbd/mouse bindings; from Tiago Cunha.
| -rw-r--r-- | app/cwm/conf.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/app/cwm/conf.c b/app/cwm/conf.c index 649863588..196ade342 100644 --- a/app/cwm/conf.c +++ b/app/cwm/conf.c @@ -15,7 +15,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $OpenBSD: conf.c,v 1.103 2012/11/07 20:34:39 okan Exp $ + * $OpenBSD: conf.c,v 1.104 2012/11/07 20:37:55 okan Exp $ */ #include <sys/param.h> @@ -483,8 +483,10 @@ conf_bindname(struct conf *c, char *name, char *binding) /* We now have the correct binding, remove duplicates. */ conf_unbind(c, current_binding); - if (strcmp("unmap", binding) == 0) + if (strcmp("unmap", binding) == 0) { + free(current_binding); return; + } for (iter = 0; iter < nitems(name_to_kbfunc); iter++) { if (strcmp(name_to_kbfunc[iter].tag, binding) != 0) @@ -574,8 +576,10 @@ conf_mousebind(struct conf *c, char *name, char *binding) conf_mouseunbind(c, current_binding); - if (strcmp("unmap", binding) == 0) + if (strcmp("unmap", binding) == 0) { + free(current_binding); return; + } for (iter = 0; iter < nitems(name_to_mousefunc); iter++) { if (strcmp(name_to_mousefunc[iter].tag, binding) != 0) |