mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-17 20:43:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

(deps/7zip) Initialize values

Browse Source
This commit is contained in:
twinaphex 2020-06-30 06:01:41 +02:00
parent 99f8137972
commit b721667523
1 changed files with 41 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
deps/7zip/7zIn.c vendored
View File

@ -331,7 +331,7 @@ static SRes SzReaduint32_t(CSzData *sd, uint32_t *value)
*value = 0; *value = 0;
for (i = 0; i < 4; i++) for (i = 0; i < 4; i++)
{ {
uint8_t b; uint8_t b = 0;
RINOK(SzReaduint8_t(sd, &b)); RINOK(SzReaduint8_t(sd, &b));
*value |= ((uint32_t)(b) << (8 * i)); *value |= ((uint32_t)(b) << (8 * i));
} }
@ -341,16 +341,16 @@ static SRes SzReaduint32_t(CSzData *sd, uint32_t *value)
static SRes SzReadNumber(CSzData *sd, uint64_t *value) static SRes SzReadNumber(CSzData *sd, uint64_t *value)
{ {
int i; int i;
uint8_t firstuint8_t; uint8_t firstuint8_t = 0;
uint8_t mask = 0x80; uint8_t mask = 0x80;
RINOK(SzReaduint8_t(sd, &firstuint8_t)); RINOK(SzReaduint8_t(sd, &firstuint8_t));
*value = 0; *value = 0;
for (i = 0; i < 8; i++) for (i = 0; i < 8; i++)
{ {
uint8_t b; uint8_t b = 0;
if ((firstuint8_t & mask) == 0) if ((firstuint8_t & mask) == 0)
{ {
uint64_t highPart = firstuint8_t & (mask - 1); uint64_t highPart = firstuint8_t & (mask - 1);
@ -446,8 +446,8 @@ static SRes SzReadBoolVector(
static SRes SzReadBoolVector2(CSzData *sd, size_t numItems, uint8_t **v, ISzAlloc *alloc) static SRes SzReadBoolVector2(CSzData *sd, size_t numItems, uint8_t **v, ISzAlloc *alloc)
{ {
uint8_t allAreDefined;
size_t i; size_t i;
uint8_t allAreDefined = 0;
RINOK(SzReaduint8_t(sd, &allAreDefined)); RINOK(SzReaduint8_t(sd, &allAreDefined));
if (allAreDefined == 0) if (allAreDefined == 0)
return SzReadBoolVector(sd, numItems, v, alloc); return SzReadBoolVector(sd, numItems, v, alloc);
@ -525,7 +525,7 @@ static SRes SzReadPackInfo(
static SRes SzReadSwitch(CSzData *sd) static SRes SzReadSwitch(CSzData *sd)
{ {
uint8_t external; uint8_t external = 0;
RINOK(SzReaduint8_t(sd, &external)); RINOK(SzReaduint8_t(sd, &external));
return (external == 0) ? SZ_OK: SZ_ERROR_UNSUPPORTED; return (external == 0) ? SZ_OK: SZ_ERROR_UNSUPPORTED;
} }
@ -551,41 +551,39 @@ static SRes SzGetNextFolderItem(CSzData *sd, CSzFolder *folder, ISzAlloc *alloc)
for (i = 0; i < numCoders; i++) for (i = 0; i < numCoders; i++)
{ {
uint8_t mainuint8_t; unsigned idSize, j;
uint8_t longID[15];
uint8_t mainuint8_t = 0;
CSzCoderInfo *coder = folder->Coders + i; CSzCoderInfo *coder = folder->Coders + i;
{ RINOK(SzReaduint8_t(sd, &mainuint8_t));
unsigned idSize, j; idSize = (unsigned)(mainuint8_t & 0xF);
uint8_t longID[15]; RINOK(SzReaduint8_ts(sd, longID, idSize));
RINOK(SzReaduint8_t(sd, &mainuint8_t)); if (idSize > sizeof(coder->MethodID))
idSize = (unsigned)(mainuint8_t & 0xF); return SZ_ERROR_UNSUPPORTED;
RINOK(SzReaduint8_ts(sd, longID, idSize)); coder->MethodID = 0;
if (idSize > sizeof(coder->MethodID)) for (j = 0; j < idSize; j++)
return SZ_ERROR_UNSUPPORTED; coder->MethodID |= (uint64_t)longID[idSize - 1 - j] << (8 * j);
coder->MethodID = 0;
for (j = 0; j < idSize; j++)
coder->MethodID |= (uint64_t)longID[idSize - 1 - j] << (8 * j);
if ((mainuint8_t & 0x10) != 0) if ((mainuint8_t & 0x10) != 0)
{ {
RINOK(SzReadNumber32(sd, &coder->NumInStreams)); RINOK(SzReadNumber32(sd, &coder->NumInStreams));
RINOK(SzReadNumber32(sd, &coder->NumOutStreams)); RINOK(SzReadNumber32(sd, &coder->NumOutStreams));
if (coder->NumInStreams > NUM_CODER_STREAMS_MAX || if (coder->NumInStreams > NUM_CODER_STREAMS_MAX ||
coder->NumOutStreams > NUM_CODER_STREAMS_MAX) coder->NumOutStreams > NUM_CODER_STREAMS_MAX)
return SZ_ERROR_UNSUPPORTED; return SZ_ERROR_UNSUPPORTED;
} }
else else
{ {
coder->NumInStreams = 1; coder->NumInStreams = 1;
coder->NumOutStreams = 1; coder->NumOutStreams = 1;
} }
if ((mainuint8_t & 0x20) != 0) if ((mainuint8_t & 0x20) != 0)
{ {
uint64_t propertiesSize = 0; uint64_t propertiesSize = 0;
RINOK(SzReadNumber(sd, &propertiesSize)); RINOK(SzReadNumber(sd, &propertiesSize));
if (!Buf_Create(&coder->Props, (size_t)propertiesSize, alloc)) if (!Buf_Create(&coder->Props, (size_t)propertiesSize, alloc))
return SZ_ERROR_MEM; return SZ_ERROR_MEM;
RINOK(SzReaduint8_ts(sd, coder->Props.data, (size_t)propertiesSize)); RINOK(SzReaduint8_ts(sd, coder->Props.data, (size_t)propertiesSize));
}
} }
while ((mainuint8_t & 0x80) != 0) while ((mainuint8_t & 0x80) != 0)
{ {
@ -741,10 +739,10 @@ static SRes SzReadSubStreamsInfo(
*numUnpackStreams = 0; *numUnpackStreams = 0;
for (i = 0; i < numFolders; i++) for (i = 0; i < numFolders; i++)
{ {
uint32_t numStreams; uint32_t numStreams = 0;
RINOK(SzReadNumber32(sd, &numStreams)); RINOK(SzReadNumber32(sd, &numStreams));
folders[i].NumUnpackStreams = numStreams; folders[i].NumUnpackStreams = numStreams;
*numUnpackStreams += numStreams; *numUnpackStreams += numStreams;
} }
continue; continue;
} }