From 8dc4f30faeb6960de5c0db6ba412e04acfd60183 Mon Sep 17 00:00:00 2001 From: Gilles Gouaillardet Date: Tue, 17 Feb 2015 15:45:06 +0900 Subject: [PATCH] orte/tools: fix NULL pointer dereference as reported by Coverity with CIDs 1196671 and 1196824 --- orte/tools/orte-info/version.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/orte/tools/orte-info/version.c b/orte/tools/orte-info/version.c index 08501df566..cd45d786ac 100644 --- a/orte/tools/orte-info/version.c +++ b/orte/tools/orte-info/version.c @@ -11,6 +11,8 @@ * All rights reserved. * Copyright (c) 2007 Sun Microsystems, Inc. All rights reserved. * Copyright (c) 2010-2011 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -275,14 +277,12 @@ static void show_mca_version(const mca_base_component_t* component, asprintf(&tmp, "%s)", content); free(content); } else { - tmp = NULL; + asprintf(&tmp, ")"); } orte_info_out(message, NULL, tmp); free(message); - if (NULL != tmp) { - free(tmp); - } + free(tmp); } else { asprintf(&message, "mca:%s:%s:version", component->mca_type_name, component->mca_component_name);