SFXSetup/SfxSetup.cpp: trying to fix hypothetical BO introduced in v.26.00,

edsilegxrepo · sebres · commit f4efd0f2d960 · 2026-02-24T14:03:50.000+01:00
applied patch provided by mshedsilegx in #468 (comment)
diff --git a/CPP/7zip/Bundles/SFXSetup/SfxSetup.cpp b/CPP/7zip/Bundles/SFXSetup/SfxSetup.cpp
@@ -71,7 +71,7 @@ static bool ReadDataString(CFSTR fileName, LPCSTR startID,
     {
       if (writeMode)
       {
-        if (pos + signatureEndSize > numBytesPrev)
+        if (pos + signatureEndSize >= numBytesPrev)
           break;
         const Byte b = buffer[pos++];
         if (b == 0)
@@ -82,7 +82,7 @@ static bool ReadDataString(CFSTR fileName, LPCSTR startID,
       }
       else
       {
-        if (pos + signatureStartSize > numBytesPrev)
+        if (pos + signatureStartSize >= numBytesPrev)
           break;
         const Byte b = buffer[pos++];
         if (b == ';' && memcmp(buffer + pos, startID + 1, signatureStartSize) == 0)

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ static bool ReadDataString(CFSTR fileName, LPCSTR startID,`
`71`	`71`	`{`
`72`	`72`	`if (writeMode)`
`73`	`73`	`{`
`74`		`- if (pos + signatureEndSize > numBytesPrev)`
	`74`	`+ if (pos + signatureEndSize >= numBytesPrev)`
`75`	`75`	`break;`
`76`	`76`	`const Byte b = buffer[pos++];`
`77`	`77`	`if (b == 0)`
`@@ -82,7 +82,7 @@ static bool ReadDataString(CFSTR fileName, LPCSTR startID,`
`82`	`82`	`}`
`83`	`83`	`else`
`84`	`84`	`{`
`85`		`- if (pos + signatureStartSize > numBytesPrev)`
	`85`	`+ if (pos + signatureStartSize >= numBytesPrev)`
`86`	`86`	`break;`
`87`	`87`	`const Byte b = buffer[pos++];`
`88`	`88`	`if (b == ';' && memcmp(buffer + pos, startID + 1, signatureStartSize) == 0)`