walkero
/
physfs
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Static analysis fix.

This commit is contained in:
Ryan C. Gordon 2017-07-17 14:19:29 -04:00
parent d38c10dea7
commit afacf0395e
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/physfs_lzmasdk.h
View File

@ -2908,17 +2908,22 @@ static SRes SzReadAndDecodePackedStreams(
UInt64 dataStartPos = 0; UInt64 dataStartPos = 0;
UInt32 fo; UInt32 fo;
CSubStreamInfo ssi; CSubStreamInfo ssi;
UInt32 numFolders;
RINOK(SzReadStreamsInfo(p, sd, numFoldersMax, NULL, 0, &dataStartPos, &ssi, allocTemp)); RINOK(SzReadStreamsInfo(p, sd, numFoldersMax, NULL, 0, &dataStartPos, &ssi, allocTemp));
dataStartPos += baseOffset; numFolders = p->NumFolders;
if (p->NumFolders == 0) if (numFolders == 0)
return SZ_ERROR_ARCHIVE; return SZ_ERROR_ARCHIVE;
else if (numFolders > numFoldersMax)
for (fo = 0; fo < p->NumFolders; fo++) return SZ_ERROR_UNSUPPORTED;
dataStartPos += baseOffset;
for (fo = 0; fo < numFolders; fo++)
Buf_Init(tempBufs + fo); Buf_Init(tempBufs + fo);
for (fo = 0; fo < p->NumFolders; fo++) for (fo = 0; fo < numFolders; fo++)
{ {
CBuf *tempBuf = tempBufs + fo; CBuf *tempBuf = tempBufs + fo;
UInt64 unpackSize = SzAr_GetFolderUnpackSize(p, fo); UInt64 unpackSize = SzAr_GetFolderUnpackSize(p, fo);
@ -2928,7 +2933,7 @@ static SRes SzReadAndDecodePackedStreams(
return SZ_ERROR_MEM; return SZ_ERROR_MEM;
} }
for (fo = 0; fo < p->NumFolders; fo++) for (fo = 0; fo < numFolders; fo++)
{ {
const CBuf *tempBuf = tempBufs + fo; const CBuf *tempBuf = tempBufs + fo;
RINOK(LookInStream_SeekTo(inStream, dataStartPos)); RINOK(LookInStream_SeekTo(inStream, dataStartPos));