psd: use byte counts for scan lines

qbnu · Jun 12, 2024 · e8d98fd · e8d98fd
1 parent 57ac9bc
commit e8d98fd
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/src/JPEGView/PSDWrapper.cpp b/src/JPEGView/PSDWrapper.cpp
@@ -300,6 +300,8 @@ CJPEGImage* PsdReader::ReadImage(LPCTSTR strFileName, bool& bOutOfMemory)
 		if (nCompressionMethod == COMPRESSION_RLE) {
 			// Skip byte counts for scanlines
 			p += nHeight * nRealChannels * 2;
+			ThrowIf(p >= (unsigned char*)pBuffer + nImageDataSize);
+			unsigned char* pOffset = p;
 			for (unsigned channel = 0; channel < nChannels; channel++) {
 				unsigned rchannel;
 				if (nColorMode == MODE_Lab) {
@@ -308,9 +310,14 @@ CJPEGImage* PsdReader::ReadImage(LPCTSTR strFileName, bool& bOutOfMemory)
 					rchannel = (-channel - 2) % nChannels;
 				}
 				for (unsigned row = 0; row < nHeight; row++) {
+					pOffset += _byteswap_ushort(*(unsigned short *)(pBuffer + (channel * nHeight + row) * 2));
+					p = pOffset;
+
 					for (unsigned count = 0; count < nWidth; ) {
 						unsigned char c;
-						ThrowIf(p >= (unsigned char*)pBuffer + nImageDataSize);
+						if (p >= (unsigned char*)pBuffer + nImageDataSize) {
+							break;
+						};
 						c = *p;
 						p += 1;