Skip to content

Commit c2e3fa0

Browse files
authored
Merge pull request #8997 from awlauria/fix_io_not_available_segv
Fix segv when io component can't be opened.
2 parents 6a6cab2 + 2457171 commit c2e3fa0

File tree

1 file changed

+9
-7
lines changed

1 file changed

+9
-7
lines changed

ompi/mca/io/base/io_base_file_select.c

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -192,14 +192,8 @@ int mca_io_base_file_select(ompi_file_t *file,
192192
unquery(avail, file);
193193
OBJ_RELEASE(item);
194194
}
195-
OBJ_RELEASE(selectable);
196-
197-
/* Save the pointers of the selected module on the ompi_file_t */
198195

199-
file->f_io_version = selected.ai_version;
200-
file->f_io_selected_component = selected.ai_component;
201-
file->f_io_selected_module = selected.ai_module;
202-
file->f_io_selected_data = selected.ai_module_data;
196+
OBJ_RELEASE(selectable);
203197

204198
if (!strcmp (selected.ai_component.v2_0_0.io_version.mca_component_name,
205199
"ompio")) {
@@ -242,6 +236,14 @@ int mca_io_base_file_select(ompi_file_t *file,
242236
}
243237

244238
}
239+
240+
/* Save the pointers of the selected module on the ompi_file_t */
241+
242+
file->f_io_version = selected.ai_version;
243+
file->f_io_selected_component = selected.ai_component;
244+
file->f_io_selected_module = selected.ai_module;
245+
file->f_io_selected_data = selected.ai_module_data;
246+
245247
/* Finally -- intialize the selected module. */
246248

247249
if (OMPI_SUCCESS != (err = module_init(file))) {

0 commit comments

Comments
 (0)