From 85a974b0deb235d81fc7e88aa40e0656e30f98a0 Mon Sep 17 00:00:00 2001 From: Ralph Castain Date: Wed, 1 Dec 2010 04:48:50 +0000 Subject: [PATCH] Better check for NULL before using the value This commit was SVN r24122. --- orte/mca/rmcast/base/rmcast_base_threads.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/orte/mca/rmcast/base/rmcast_base_threads.c b/orte/mca/rmcast/base/rmcast_base_threads.c index 7485138290..c7c7c0fff1 100644 --- a/orte/mca/rmcast/base/rmcast_base_threads.c +++ b/orte/mca/rmcast/base/rmcast_base_threads.c @@ -205,6 +205,13 @@ int orte_rmcast_base_process_msg(opal_buffer_t *msg) recv = ptr; break; } + + if (NULL == recv) { + /* recv not found - dump msg */ + ORTE_RELEASE_THREAD(&orte_rmcast_base.main_ctl); + goto cleanup; + } + if (!(ORTE_RMCAST_PERSISTENT & recv->flags)) { OPAL_OUTPUT_VERBOSE((2, orte_rmcast_base.rmcast_output, "%s rmcast:base:process_recv removing non-persistent recv", @@ -213,11 +220,6 @@ int orte_rmcast_base_process_msg(opal_buffer_t *msg) } ORTE_RELEASE_THREAD(&orte_rmcast_base.main_ctl); - if (NULL == recv) { - /* recv not found - dump msg */ - goto cleanup; - } - OPAL_OUTPUT_VERBOSE((2, orte_rmcast_base.rmcast_output, "%s rmcast:base:process_recv delivering message to channel %d tag %d", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), recv->channel, (int)tag));