From b315cd9cce5b6da7ca89b2d7bad3fb01e7716044 Mon Sep 17 00:00:00 2001 From: Boris Ostrovsky Date: Wed, 13 May 2015 13:37:35 -0400 Subject: [PATCH] xenpm: Initialize cputopo pointer Commit 250f0b43af1a ("libxl/libxc: Move libxl_get_cpu_topology()'s hypercall buffer management to libxc") broke non-debug compilation: on error path we may have uninitialized cputopo pointer. Signed-off-by: Boris Ostrovsky Reported-by: Olaf Hering Acked-by: Wei Liu Acked-by: Ian Campbell --- tools/misc/xenpm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/misc/xenpm.c b/tools/misc/xenpm.c index 24ee6ef9d2..fe2c001841 100644 --- a/tools/misc/xenpm.c +++ b/tools/misc/xenpm.c @@ -355,7 +355,7 @@ static void signal_int_handler(int signo) int i, j, k; struct timeval tv; int cx_cap = 0, px_cap = 0; - xc_cputopo_t *cputopo; + xc_cputopo_t *cputopo = NULL; unsigned max_cpus; if ( xc_cputopoinfo(xc_handle, &max_cpus, NULL) != 0 ) @@ -960,7 +960,7 @@ void scaling_governor_func(int argc, char *argv[]) void cpu_topology_func(int argc, char *argv[]) { - xc_cputopo_t *cputopo; + xc_cputopo_t *cputopo = NULL; unsigned max_cpus; int i, rc; -- 2.30.2