From: PRAMOD DEVENDRA Subject: [PATCH 2/3] tools/libxl/libxl_cpuid.c: Fix leak of resstr on error path Date: Mon, 16 Mar 2015 10:06:17 +0000 Message-ID: <1426500377-40643-1-git-send-email-pramod.devendra@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YXS0M-0008F3-72 for xen-devel@lists.xenproject.org; Mon, 16 Mar 2015 10:12:14 +0000 List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: xen-devel@lists.xenproject.org Cc: Ian Jackson , Wei Liu , Pramod Devendra , Ian Campbell , Stefano Stabellini List-Id: xen-devel@lists.xenproject.org From: Pramod Devendra Signed-off-by: Pramod Devendra CC: Ian Jackson CC: Stefano Stabellini CC: Ian Campbell CC: Wei Liu --- tools/libxl/libxl_cpuid.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/tools/libxl/libxl_cpuid.c b/tools/libxl/libxl_cpuid.c index b0bdc9d..c66e912 100644 --- a/tools/libxl/libxl_cpuid.c +++ b/tools/libxl/libxl_cpuid.c @@ -223,9 +223,6 @@ int libxl_cpuid_parse_config(libxl_cpuid_policy_list *cpuid, const char* str) } entry = cpuid_find_match(cpuid, flag->leaf, flag->subleaf); resstr = entry->policy[flag->reg - 1]; - if (resstr == NULL) { - resstr = strdup("xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"); - } num = strtoull(val, &endptr, 0); flags[flag->length] = 0; if (endptr != val) { @@ -242,6 +239,11 @@ int libxl_cpuid_parse_config(libxl_cpuid_policy_list *cpuid, const char* str) return 3; } } + + if (resstr == NULL) { + resstr = strdup("xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"); + } + /* the family and model entry is potentially split up across * two fields in Fn0000_0001_EAX, so handle them here separately. */ -- 1.7.10.4