Skip to content

Commit b17cb01

Browse files
authored
Merge pull request #8529 from yasushi-saito/saito-fixnull
Fix a crash during CUDA initialization
2 parents d1720bf + 22f773e commit b17cb01

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

ompi/proc/proc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,7 @@ int ompi_proc_complete_init(void)
304304
opal_process_name_t wildcard_rank;
305305
ompi_proc_t *proc;
306306
int ret, errcode = OMPI_SUCCESS;
307-
char *val;
307+
char *val = NULL;
308308

309309
opal_mutex_lock (&ompi_proc_lock);
310310

opal/mca/btl/smcuda/btl_smcuda.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -251,6 +251,7 @@ smcuda_btl_first_time_init(mca_btl_smcuda_t *smcuda_btl,
251251
free(loc);
252252
} else {
253253
/* If we have hwloc support, then get accurate information */
254+
loc = NULL;
254255
if (OPAL_SUCCESS == opal_hwloc_base_get_topology()) {
255256
i = opal_hwloc_base_get_nbobjs_by_type(opal_hwloc_topology,
256257
HWLOC_OBJ_NODE, 0,

0 commit comments

Comments
 (0)