Skip to content

BUG: Fix an out-of-bounds indirect call in axio_show_mim_summary #40

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hjmjohnson merged 3 commits into from
Sep 22, 2026
Merged

BUG: Fix an out-of-bounds indirect call in axio_show_mim_summary #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
da3bf7f
BUG: Fix an out-of-bounds indirect call in axio_show_mim_summary
gdevenyi Aug 15, 2026
e2f30ed
ENH: Cover the MatrixIndicesMap dispatch in axio_show_mim_summary
hjmjohnson Sep 22, 2026
4027649
BUG: Free the XML tree and image that cifti_tool parses
hjmjohnson Sep 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions cifti/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,19 @@ if(NIFTI_BUILD_APPLICATIONS)
install_nifti_target(${NIFTI_PACKAGE_PREFIX}afni_xml_tool)
install_nifti_target(${NIFTI_PACKAGE_PREFIX}cifti_tool)
endif()

if(NIFTI_BUILD_TESTING AND NIFTI_BUILD_APPLICATIONS)
set(TEST_PREFIX "${NIFTI_PACKAGE_PREFIX}cifti")
# An unrecognized MatrixIndicesMap child is skipped, not dispatched on.
add_test( NAME ${TEST_PREFIX}_mim_summary_unknown_child
COMMAND $<TARGET_FILE:${NIFTI_PACKAGE_PREFIX}cifti_tool>
-as_cext -eval_cext -eval_type show_summary
-input ${CMAKE_CURRENT_LIST_DIR}/testdata/mim_unknown_child.xml )
# A recognized child is still displayed.
add_test( NAME ${TEST_PREFIX}_mim_summary_known_child
COMMAND $<TARGET_FILE:${NIFTI_PACKAGE_PREFIX}cifti_tool>
-as_cext -eval_cext -eval_type show_summary
-input ${CMAKE_CURRENT_LIST_DIR}/testdata/mim_known_child.xml )
set_tests_properties( ${TEST_PREFIX}_mim_summary_known_child
PROPERTIES PASS_REGULAR_EXPRESSION "BrainModel" )
endif()
3 changes: 2 additions & 1 deletion cifti/afni_xml_io.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,8 @@ int axio_show_mim_summary(FILE * fp, const char * mesg, afni_xml_t * ax, int ver

for( kid=0; kid<xt->nchild; kid++ ) {
mind = get_map_index(xt->xchild[kid]);
if( kid >= 0 ) MIM_disp_funcs[mind](ofp, xt->xchild[kid], verb);
/* get_map_index() returns -1 for an unrecognized element name */
if( mind >= 0 ) MIM_disp_funcs[mind](ofp, xt->xchild[kid], verb);
}
}

Expand Down
3 changes: 3 additions & 0 deletions cifti/cifti_tool.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,9 @@ int process(opts_t * opts)
if( opts->disp_cext ) disp_cifti_extension(nim, opts);
if( opts->eval_cext ) eval_cifti_extension(ax, opts);

axml_free_xml_t(ax);
nifti_image_free(nim);

return 0;
}

Expand Down
7 changes: 7 additions & 0 deletions cifti/testdata/mim_known_child.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<CIFTI Version="2">
<Matrix>
<MatrixIndicesMap AppliesToMatrixDimension="0" IndicesMapToDataType="CIFTI_INDEX_TYPE_BRAIN_MODELS">
<BrainModel IndexOffset="0" IndexCount="2" ModelType="CIFTI_MODEL_TYPE_VOXELS" BrainStructure="CIFTI_STRUCTURE_CORTEX_LEFT"/>
</MatrixIndicesMap>
</Matrix>
</CIFTI>
7 changes: 7 additions & 0 deletions cifti/testdata/mim_unknown_child.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<CIFTI Version="2">
<Matrix>
<MatrixIndicesMap AppliesToMatrixDimension="0" IndicesMapToDataType="CIFTI_INDEX_TYPE_BRAIN_MODELS">
<UnrecognizedElement/>
</MatrixIndicesMap>
</Matrix>
</CIFTI>
Loading