Repository navigation
BUG: Keep the XML skip depth at the element that started the skip - #125
Draft
hjmjohnson wants to merge 3 commits into
Draft
hjmjohnson wants to merge 3 commits into
hjmjohnson wants to merge 3 commits into
Conversation
hjmjohnson
marked this pull request as ready for review
September 24, 2026 12:18
hjmjohnson
marked this pull request as draft
October 6, 2026 15:02
hjmjohnson
force-pushed
the
stack/pr-fix-alloc-null-checks
branch
from
November 2, 2026 15:32
48f6b68 to
9136ec2
Compare
hjmjohnson
force-pushed
the
stack/fix-axml-skip-depth
branch
2 times, most recently
from
November 6, 2026 14:59
cd03008 to
fe446fe
Compare
hjmjohnson
force-pushed
the
stack/pr-fix-alloc-null-checks
branch
from
November 6, 2026 14:59
9136ec2 to
924169e
Compare
gdevenyi
requested changes
Nov 12, 2026
gdevenyi
left a comment
Collaborator
There was a problem hiding this comment.
Review by Google Carbon
Verdict: Request Changes (Draft; unbundle hitchhiking #111 + minor OOM leak note; XML dskip state machine verified exact!)
Traced every depth transition in epush and epop (cifti/afni_xml.c) across depth = 1..16, depth = 17 (AXML_MAX_DEPTH + 1), and nested depth = 18+ elements:
- Moving
if (xd->dskip == xd->depth) xd->dskip = 0;beforeepop_xmland keeping the outermost skip depth viaif (errs && !xd->dskip) xd->dskip = xd->depth;is mathematically exact and completely eliminates the out-of-boundsxd->stack[16]read/write when an XML document exceedsAXML_MAX_DEPTH(16)! - The defensive bounds and
NULLguards insideepop_xml(lines 805-815) are also solid.
Changes requested before merging:
- Unbundle PR
#111(znzread/nifti_read_buffershort-read fix): This branch silently bundles#111alongside the XML depth-skip fix. Please rebase ontomasterso#125contains only thecifti/afni_xml.c+ test commit. - Pre-existing OOM leak interaction in
epush(cifti/afni_xml.c:739-750): Note inline below on freeingacurifadd_to_xroot_list/add_to_xchild_listfails when settingxd->dskip.
hjmjohnson
force-pushed
the
stack/pr-fix-alloc-null-checks
branch
from
November 17, 2026 22:50
924169e to
b56f419
Compare
hjmjohnson
force-pushed
the
stack/fix-axml-skip-depth
branch
from
November 17, 2026 22:50
fe446fe to
977b40c
Compare
Member
Author
afni_xml's parser holds sixteen levels of open elements in a fixed array and refuses to push a seventeenth by entering a skip block: epush() records the depth in xd->dskip and stops touching the stack until the matching pop. Two details of that bookkeeping are wrong. epush() overwrote dskip on every push past the limit, so the skip was recorded as starting at the innermost depth. epop() then cleared dskip before the stack was handled, so the pop that ends the skip fell through to "xd->stack[xd->depth-1] = NULL" and wrote a pointer eight bytes past the sixteen-entry array, which lives in the file-scope afni_xml_control. The next pop found dskip clear and dereferenced xd->stack[16]. epush() now keeps the outermost skip depth, since that is the depth whose pop ends the skip, and epop() clears dskip only after the element has been skipped. Depths within the limit are unaffected. The XML comes from the CIFTI extension of a NIfTI file, or from any file read by axml_read_file(), so the nesting is chosen by the input. Found by fuzzing axml_read_buf() with libFuzzer under AddressSanitizer. (cherry picked from commit 6ddc454)
process_popped_element() read xd->stack[xd->depth-1] and dereferenced it without a test. A slot is filled by the matching epush(), and an element that was skipped never fills one, so the read is only safe because the preceding commit keeps the skip running to the element that started it. Guard it rather than rely on that: check the depth is inside the stack, and that the slot holds a struct with a name, before the strcmp(). (cherry picked from commit d34f28c)
deep_nesting.xml nests twenty elements inside a CIFTI extension whose stack holds sixteen, which is the shape that walked off the end of xd->stack. The test drives it through cifti_tool and pins that the BrainModel sibling is still summarized, so a fix that refused the whole document would not pass. (cherry picked from commit 0e0033d)
hjmjohnson
force-pushed
the
stack/pr-fix-alloc-null-checks
branch
from
November 19, 2026 19:01
b56f419 to
743ace9
Compare
hjmjohnson
force-pushed
the
stack/fix-axml-skip-depth
branch
from
November 19, 2026 19:01
977b40c to
22bb490
Compare
Member
Author
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Re-submission of #65, reverted from
masteron 2026-09-24. Content isunchanged from the original.
Position 3 of 11 in the deep stack. Base:
stack/pr-fix-alloc-null-checks.Based on the pull request above it in the stack, so the diff shown here is
this change alone. Merge the stack bottom-up.
Stack order
stack/test-regression-coveragemasterstack/pr-fix-alloc-null-checksstack/test-regression-coveragestack/fix-axml-skip-depth<- this PRstack/pr-fix-alloc-null-checksstack/pr-fix-analyzer-leaksstack/fix-axml-skip-depthstack/pr-fix-sign-conversionstack/pr-fix-analyzer-leaksstack/fix-fslio-64bit-arithmeticstack/pr-fix-sign-conversionstack/fix-cifti-null-streamstack/fix-fslio-64bit-arithmeticstack/pr-fix-calloc-transposed-argsstack/fix-cifti-null-streamstack/pr-fix-shorten-64-to-32stack/pr-fix-calloc-transposed-argsstack/fix-image-read-complex-checkstack/pr-fix-shorten-64-to-32stack/pr-fix-xml-read-errorsstack/fix-image-read-complex-checkThe order is the order these changes sat on
masterbefore the revert, soit builds and tests at every step.
Commits introduced by this PR
Ordering for all the re-submitted work is tracked in #84.