Coverty: fix issues with using a string once it get freed. The problem, is that the
mca_base_register_string don't set the result to NULL is an error occurs. This commit was SVN r16108.
Этот коммит содержится в:
родитель
7b3dcff267
Коммит
e5d316dba6
@ -190,7 +190,7 @@ static int oob_tcp_windows_progress_callback( void )
|
|||||||
int mca_oob_tcp_component_open(void)
|
int mca_oob_tcp_component_open(void)
|
||||||
{
|
{
|
||||||
int value = 0;
|
int value = 0;
|
||||||
char *listen_type, *str;
|
char *listen_type, *str = NULL;
|
||||||
int tmp;
|
int tmp;
|
||||||
|
|
||||||
#ifdef __WINDOWS__
|
#ifdef __WINDOWS__
|
||||||
@ -277,6 +277,7 @@ int mca_oob_tcp_component_open(void)
|
|||||||
mca_oob_tcp_component.tcp_include = str;
|
mca_oob_tcp_component.tcp_include = str;
|
||||||
} else {
|
} else {
|
||||||
free(str);
|
free(str);
|
||||||
|
str = NULL; /* reset to NULL so we can use it again later */
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -294,6 +295,7 @@ int mca_oob_tcp_component_open(void)
|
|||||||
mca_oob_tcp_component.tcp_exclude = str;
|
mca_oob_tcp_component.tcp_exclude = str;
|
||||||
} else {
|
} else {
|
||||||
free(str);
|
free(str);
|
||||||
|
str = NULL; /* reset to NULL so we can use it again later */
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1453,7 +1455,6 @@ mca_oob_tcp_get_new_name(orte_process_name_t* name)
|
|||||||
{
|
{
|
||||||
mca_oob_tcp_peer_t* peer = mca_oob_tcp_peer_lookup(ORTE_PROC_MY_HNP);
|
mca_oob_tcp_peer_t* peer = mca_oob_tcp_peer_lookup(ORTE_PROC_MY_HNP);
|
||||||
mca_oob_tcp_msg_t* msg;
|
mca_oob_tcp_msg_t* msg;
|
||||||
int size;
|
|
||||||
int rc;
|
int rc;
|
||||||
|
|
||||||
if(NULL == peer)
|
if(NULL == peer)
|
||||||
@ -1464,9 +1465,6 @@ mca_oob_tcp_get_new_name(orte_process_name_t* name)
|
|||||||
return rc;
|
return rc;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* calculate the size of the message */
|
|
||||||
size = 0;
|
|
||||||
|
|
||||||
if(mca_oob_tcp_component.tcp_debug >= OOB_TCP_DEBUG_ALL) {
|
if(mca_oob_tcp_component.tcp_debug >= OOB_TCP_DEBUG_ALL) {
|
||||||
opal_output(0, "%s-%s mca_oob_tcp_get_new_name: starting\n",
|
opal_output(0, "%s-%s mca_oob_tcp_get_new_name: starting\n",
|
||||||
ORTE_NAME_PRINT(orte_process_info.my_name),
|
ORTE_NAME_PRINT(orte_process_info.my_name),
|
||||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user