HPCC-35955 Fix error parsing XML when deleting orphan file

jackdelv · jackdelv · commit ef1157c76834 · 2026-03-04T16:25:09.000-05:00
diff --git a/dali/dfuXRefLib/XRefFilesNode.cpp b/dali/dfuXRefLib/XRefFilesNode.cpp
@@ -40,11 +40,10 @@ void readXrefBranch(const char *branchName, const char *filePath, offset_t maxFi
                 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);
                     if (bytesRead == 0)
                         throw makeStringExceptionV(0, "Failed to read %s from file", branchName);
-                    ptr[fileSize] = '\0'; // Ensure null-terminated
                 }
                 else
                     throw makeStringExceptionV(0, "File exceeds maximum size tolerance (%u MB). File size = %u MB", (unsigned)(maxFileSize / 0x100000), (unsigned)(fileSize / 0x100000));

Original file line number	Diff line number	Diff line change
`@@ -40,11 +40,10 @@ void readXrefBranch(const char branchName, const char filePath, offset_t maxFi`
`40`	`40`	`if (fileSize < maxFileSize)`
`41`	`41`	`{`
`42`	`42`	`dst.ensureCapacity((size32_t)fileSize);`
`43`		`- char ptr = (char )dst.reserveTruncate((size32_t)fileSize+1);`
	`43`	`+ char ptr = (char )dst.reserveTruncate((size32_t)fileSize);`
`44`	`44`	`size32_t bytesRead = fileIO->read(0, (size32_t)fileSize, ptr);`
`45`	`45`	`if (bytesRead == 0)`
`46`	`46`	`throw makeStringExceptionV(0, "Failed to read %s from file", branchName);`
`47`		`- ptr[fileSize] = '\0'; // Ensure null-terminated`
`48`	`47`	`}`
`49`	`48`	`else`
`50`	`49`	`throw makeStringExceptionV(0, "File exceeds maximum size tolerance (%u MB). File size = %u MB", (unsigned)(maxFileSize / 0x100000), (unsigned)(fileSize / 0x100000));`