Bugfix: PSD: properly skip image resource names

Skip Pascal strings properly

Merge PR #308 by https://github.com/qbnu

Author: sylikc

src/JPEGView/PSDWrapper.cpp

@@ -79,7 +79,7 @@ static inline unsigned short ReadUShortFromFile(HANDLE file) {
 }
 
 // Read and return an unsigned char from file
-static inline unsigned short ReadUCharFromFile(HANDLE file) {
+static inline unsigned char ReadUCharFromFile(HANDLE file) {
 	unsigned char val;
 	ReadFromFile(&val, file, 1);
 	return val;
@@ -191,7 +191,8 @@ CJPEGImage* PsdReader::ReadImage(LPCTSTR strFileName, bool& bOutOfMemory)
 			unsigned short nResourceID = ReadUShortFromFile(hFile);
 
 			// Skip Pascal string (padded to be even length)
-			while (ReadUShortFromFile(hFile));
+			unsigned char nStringSize = ReadUCharFromFile(hFile);
+			SeekFile(hFile, nStringSize | 1);
 
 			// Resource size
 			unsigned int nResourceSize = ReadUIntFromFile(hFile);
@@ -437,7 +438,8 @@ CJPEGImage* PsdReader::ReadThumb(LPCTSTR strFileName, bool& bOutOfMemory)
 			unsigned short nResourceID = ReadUShortFromFile(hFile);
 
 			// Skip Pascal string (padded to be even length)
-			while (ReadUShortFromFile(hFile));
+			unsigned char nStringSize = ReadUCharFromFile(hFile);
+			SeekFile(hFile, nStringSize | 1);
 
 			// Resource size
 			unsigned int nResourceSize = ReadUIntFromFile(hFile);