Skip to content

Commit 73469cb

Browse files
authored
Merge pull request #7416 from hjelmn/lets_crash_on_debug_builds_if_the_user_home_directory_is_not_available
opal/mca: check if the user home directory is NULL
2 parents eeb3d7f + 8197efa commit 73469cb

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

opal/mca/base/mca_base_var.c

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -403,9 +403,6 @@ int mca_base_var_cache_files(bool rel_path_search)
403403
char *tmp;
404404
int ret;
405405

406-
/* We may need this later */
407-
home = (char*)opal_home_directory();
408-
409406
if (NULL == cwd) {
410407
cwd = (char *) malloc(sizeof(char) * MAXPATHLEN);
411408
if( NULL == (cwd = getcwd(cwd, MAXPATHLEN) )) {
@@ -415,6 +412,13 @@ int mca_base_var_cache_files(bool rel_path_search)
415412
}
416413

417414
#if OPAL_WANT_HOME_CONFIG_FILES
415+
/* We may need this later */
416+
home = (char*)opal_home_directory();
417+
if (NULL == home) {
418+
opal_output(0, "Error: Unable to get the user home directory\n");
419+
return OPAL_ERROR;
420+
}
421+
418422
opal_asprintf(&mca_base_var_files, "%s"OPAL_PATH_SEP".openmpi" OPAL_PATH_SEP
419423
"mca-params.conf%c%s" OPAL_PATH_SEP "openmpi-mca-params.conf",
420424
home, ',', opal_install_dirs.sysconfdir);

0 commit comments

Comments
 (0)