From cc8ebe7dd5525db9904ae3c2449b7a221d5f17d3 Mon Sep 17 00:00:00 2001 From: Ralph Castain Date: Mon, 17 May 2010 02:50:39 +0000 Subject: [PATCH] Protect against NULL when looking for an MCA param in an environment This commit was SVN r23151. --- opal/mca/base/mca_base_param.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/opal/mca/base/mca_base_param.c b/opal/mca/base/mca_base_param.c index a90875dd01..fc8fb99f74 100644 --- a/opal/mca/base/mca_base_param.c +++ b/opal/mca/base/mca_base_param.c @@ -2201,6 +2201,10 @@ int mca_base_param_find_int(const mca_base_component_t *component, int len, i; int rc=OPAL_ERR_NOT_FOUND; + if (NULL == env) { + return OPAL_ERR_NOT_FOUND; + } + asprintf(&tmp, "%s%s_%s_%s", mca_prefix, component->mca_type_name, component->mca_component_name, param_name); len = strlen(tmp); @@ -2226,6 +2230,10 @@ int mca_base_param_find_int_name(const char *type, int len, i; int rc=OPAL_ERR_NOT_FOUND; + if (NULL == env) { + return OPAL_ERR_NOT_FOUND; + } + asprintf(&tmp, "%s%s_%s", mca_prefix, type, param_name); len = strlen(tmp); for (i=0; NULL != env[i]; i++) { @@ -2250,6 +2258,10 @@ int mca_base_param_find_string(const mca_base_component_t *component, int len, i; int rc=OPAL_ERR_NOT_FOUND; + if (NULL == env) { + return OPAL_ERR_NOT_FOUND; + } + asprintf(&tmp, "%s%s_%s_%s", mca_prefix, component->mca_type_name, component->mca_component_name, param_name); len = strlen(tmp); @@ -2275,6 +2287,10 @@ int mca_base_param_find_string_name(const char *type, int len, i; int rc=OPAL_ERR_NOT_FOUND; + if (NULL == env) { + return OPAL_ERR_NOT_FOUND; + } + asprintf(&tmp, "%s%s_%s", mca_prefix, type, param_name); len = strlen(tmp); for (i=0; NULL != env[i]; i++) {