From f97021eb92e91db8032d600893a531863a18bd23 Mon Sep 17 00:00:00 2001 From: Wei Liu Date: Tue, 14 Jul 2015 17:41:10 +0100 Subject: [PATCH] xl: correct handling of extra_config in main_cpupoolcreate Don't dereference extra_config if it's NULL. Don't leak extra_config in the end. Also fixed a typo in error string while I was there. Signed-off-by: Wei Liu Acked-by: Ian Jackson (cherry picked from commit 705c9e12426cba82804cb578fc70785281655d94) (cherry picked from commit ffb4e6387f489b6b5ce287f51db43cb37ebae064) (cherry picked from commit 213e243819ba5f72e13afad41ce2f5df17715530) --- tools/libxl/xl_cmdimpl.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 55b4064964..784f676d57 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -6412,9 +6412,9 @@ int main_cpupoolcreate(int argc, char **argv) else config_src="command line"; - if (strlen(extra_config)) { + if (extra_config && strlen(extra_config)) { if (config_len > INT_MAX - (strlen(extra_config) + 2)) { - fprintf(stderr, "Failed to attach extra configration\n"); + fprintf(stderr, "Failed to attach extra configuration\n"); goto out; } config_data = xrealloc(config_data, @@ -6537,6 +6537,7 @@ out_cfg: xlu_cfg_destroy(config); out: free(config_data); + free(extra_config); return rc; } -- 2.39.5