Skip to content

HPCC-35955 Fix error parsing XML when deleting orphan file#21064

Merged
ghalliday merged 1 commit intohpcc-systems:candidate-9.14.xfrom
jackdelv:delete-orphans-error
Mar 6, 2026
Merged

HPCC-35955 Fix error parsing XML when deleting orphan file#21064
ghalliday merged 1 commit intohpcc-systems:candidate-9.14.xfrom
jackdelv:delete-orphans-error

Conversation

@jackdelv
Copy link
Contributor

@jackdelv jackdelv commented Mar 4, 2026

Type of change:

  • This change is a bug fix (non-breaking change which fixes an issue).
  • This change is a new feature (non-breaking change which adds functionality).
  • This change improves the code (refactor or other change that does not change the functionality)
  • This change fixes warnings (the fix does not alter the functionality or the generated code)
  • This change is a breaking change (fix or feature that will cause existing behavior to change).
  • This change alters the query API (existing queries will have to be recompiled)

Checklist:

  • My code follows the code style of this project.
    • My code does not create any new warnings from compiler, build system, or lint.
  • The commit message is properly formatted and free of typos.
    • The commit message title makes sense in a changelog, by itself.
    • The commit is signed.
  • My change requires a change to the documentation.
    • I have updated the documentation accordingly, or...
    • I have created a JIRA ticket to update the documentation.
    • Any new interfaces or exported functions are appropriately commented.
  • I have read the CONTRIBUTORS document.
  • The change has been fully tested:
    • I have added tests to cover my changes.
    • All new and existing tests passed.
    • I have checked that this change does not introduce memory leaks.
    • I have used Valgrind or similar tools to check for potential issues.
  • I have given due consideration to all of the following potential concerns:
    • Scalability
    • Performance
    • Security
    • Thread-safety
    • Cloud-compatibility
    • Premature optimization
    • Existing deployed queries will not be broken
    • This change fixes the problem, not just the symptom
    • The target branch of this pull request is appropriate for such a change.
  • There are no similar instances of the same problem that should be addressed
    • I have addressed them here
    • I have raised JIRA issues to address them separately
  • This is a user interface / front-end modification
    • I have tested my changes in multiple modern browsers
    • The component(s) render as expected

Smoketest:

  • Send notifications about my Pull Request position in Smoketest queue.
  • Test my draft Pull Request.

Testing:

Copilot AI review requested due to automatic review settings March 4, 2026 21:26
@github-actions
Copy link

github-actions bot commented Mar 4, 2026

Jira Issue: https://hpccsystems.atlassian.net//browse/HPCC-35955

Jirabot Action Result:
Workflow Transition To: Merge Pending
Updated PR

Copy link
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This PR addresses HPCC-35955 by adjusting how XRef XML content is read into a MemoryBuffer, aiming to prevent XML parsing errors when handling orphan file deletion scenarios in the Dali DFU XRef subsystem.

Changes:

  • Changed readXrefBranch() to allocate/read exactly fileSize bytes (instead of fileSize + 1) and removed explicit null-termination.
  • Left the rest of the XRef file-backed load path unchanged.

Comment on lines 40 to 44
if (fileSize < maxFileSize)
{
dst.ensureCapacity((size32_t)fileSize);
char *ptr = (char *)dst.reserveTruncate((size32_t)fileSize+1);
char *ptr = (char *)dst.reserveTruncate((size32_t)fileSize);
size32_t bytesRead = fileIO->read(0, (size32_t)fileSize, ptr);
Copy link

Copilot AI Mar 4, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changing reserveTruncate() from (fileSize+1) to fileSize removes the null terminator previously appended by this helper, but other callers still assume a terminator is present (e.g. CXRefNode::serializeBranch drops len-1 and will now truncate the last byte). Either restore the prior contract (ensure a terminator without counting it in dst.length()), or update all call sites and the function comment to treat dst as a length-delimited buffer with no terminator.

Copilot uses AI. Check for mistakes.
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed. I left the null terminator in and changed to use the const char * overload of createPTreeFromXMLString. This way it still avoids trying to process the null terminator.

@jackdelv jackdelv force-pushed the delete-orphans-error branch from ef1157c to ccbfb49 Compare March 5, 2026 13:36
@jackdelv jackdelv requested a review from jakesmith March 5, 2026 14:18
@ghalliday ghalliday self-requested a review March 5, 2026 19:12
@ghalliday ghalliday merged commit 798685a into hpcc-systems:candidate-9.14.x Mar 6, 2026
51 checks passed
@github-actions
Copy link

github-actions bot commented Mar 6, 2026

Jirabot Action Result:
Added fix version: 9.14.70
Added fix version: 10.0.44
Added fix version: 10.2.18
Workflow Transition: 'Resolve issue'

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants