From f162f00f1db2cd0141958a4d8ed4a665bfc888e3 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Thu, 27 Feb 2014 11:22:27 +1000 Subject: [PATCH] Plug a memory leak for name, uniq, phys If a device is assigned a name, uniq and/or phys before calling libevdev_set_fd(), those values would leak. Change the default alloc to calloc, so name, uniq, and phys are initialized to zero before we call libevdev_reset Signed-off-by: Peter Hutterer --- libevdev/libevdev.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libevdev/libevdev.c b/libevdev/libevdev.c index 526c448..6127e64 100644 --- a/libevdev/libevdev.c +++ b/libevdev/libevdev.c @@ -133,6 +133,9 @@ log_msg(enum libevdev_log_priority priority, static void libevdev_reset(struct libevdev *dev) { + free(dev->name); + free(dev->phys); + free(dev->uniq); memset(dev, 0, sizeof(*dev)); dev->fd = -1; dev->initialized = false; @@ -148,7 +151,7 @@ libevdev_new(void) { struct libevdev *dev; - dev = malloc(sizeof(*dev)); + dev = calloc(1, sizeof(*dev)); if (!dev) return NULL;