From 03db71caea98f8a2c5d302763289495ea2b30596 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Majerech?= Date: Thu, 11 Sep 2014 15:53:15 +0200 Subject: compositor: Don't free an uninitialised pointer. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When backend_init returns NULL, we goto out_signals, which wants to free(modules), but in this particular code path, modules hasn't been initialised leading to a "Double-free or corruption" error message. Initialising modules to NULL makes the free a no-op in this scenario. Signed-off-by: Ondřej Majerech Reviewed-by: Ryo Munakata --- src/compositor.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/compositor.c b/src/compositor.c index b0bc86c9..a2197662 100644 --- a/src/compositor.c +++ b/src/compositor.c @@ -4335,7 +4335,8 @@ int main(int argc, char *argv[]) int i, fd; char *backend = NULL; char *shell = NULL; - char *modules, *option_modules = NULL; + char *modules = NULL; + char *option_modules = NULL; char *log = NULL; char *server_socket = NULL, *end; int32_t idle_time = 300; -- cgit v1.2.1