Revise OKT loader PATT bounding, import fix from Konstanty#53.

AliceLR · AliceLR · commit 7564bf28339a · 2021-06-17T21:04:15.000-06:00
diff --git a/src/load_okt.cpp b/src/load_okt.cpp
@@ -101,13 +101,13 @@ BOOL CSoundFile::ReadOKT(const BYTE *lpStream, DWORD dwMemLength)
 		dwMemPos += bswapBE32(*((DWORD *)(lpStream + dwMemPos + 4))) + 8;
 	}
 	// PATT
-	if (dwMemPos + 10 > dwMemLength) return TRUE;
+	if (dwMemPos + 8 > dwMemLength) return TRUE;
 	if (*((DWORD *)(lpStream + dwMemPos)) == 0x54544150)
 	{
 		UINT orderlen = norders;
 		if (orderlen >= MAX_ORDERS) orderlen = MAX_ORDERS-1;
-		if (dwMemPos + 10 + orderlen > dwMemLength) return TRUE;
-		for (UINT i=0; i<orderlen; i++) Order[i] = lpStream[dwMemPos+10+i];
+		if (dwMemPos + 8 + orderlen > dwMemLength) return TRUE;
+		for (UINT i=0; i<orderlen; i++) Order[i] = lpStream[dwMemPos+8+i];
 		for (UINT j=orderlen; j>1; j--) { if (Order[j-1]) break; Order[j-1] = 0xFF; }
 		dwMemPos += bswapBE32(*((DWORD *)(lpStream + dwMemPos + 4))) + 8;
 	}

Original file line number	Diff line number	Diff line change
`@@ -101,13 +101,13 @@ BOOL CSoundFile::ReadOKT(const BYTE *lpStream, DWORD dwMemLength)`
`101`	`101`	`dwMemPos += bswapBE32(((DWORD )(lpStream + dwMemPos + 4))) + 8;`
`102`	`102`	`}`
`103`	`103`	`// PATT`
`104`		`- if (dwMemPos + 10 > dwMemLength) return TRUE;`
	`104`	`+ if (dwMemPos + 8 > dwMemLength) return TRUE;`
`105`	`105`	`if (((DWORD )(lpStream + dwMemPos)) == 0x54544150)`
`106`	`106`	`{`
`107`	`107`	`UINT orderlen = norders;`
`108`	`108`	`if (orderlen >= MAX_ORDERS) orderlen = MAX_ORDERS-1;`
`109`		`- if (dwMemPos + 10 + orderlen > dwMemLength) return TRUE;`
`110`		`- for (UINT i=0; i<orderlen; i++) Order[i] = lpStream[dwMemPos+10+i];`
	`109`	`+ if (dwMemPos + 8 + orderlen > dwMemLength) return TRUE;`
	`110`	`+ for (UINT i=0; i<orderlen; i++) Order[i] = lpStream[dwMemPos+8+i];`
`111`	`111`	`for (UINT j=orderlen; j>1; j--) { if (Order[j-1]) break; Order[j-1] = 0xFF; }`
`112`	`112`	`dwMemPos += bswapBE32(((DWORD )(lpStream + dwMemPos + 4))) + 8;`
`113`	`113`	`}`