thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SCI: Fix incorrect usage of sizeof

Browse source 
Thanks to salty-horse for the reports.
This commit is contained in:
Willem Jan Palenstijn 2011-06-25 21:15:34 +02:00
parent 4cbf30a88c
commit bc4691a23e
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
engines/sci/decompressor.cpp
View file

@ -257,7 +257,8 @@ int DecompressorLZW::unpackLZW1(Common::ReadStream *src, byte *dest, uint32 nPac
init(src, dest, nPacked, nUnpacked); init(src, dest, nPacked, nUnpacked);
byte *stak = (byte *)malloc(0x1014); byte *stak = (byte *)malloc(0x1014);
Tokenlist *tokens = (Tokenlist *)malloc(0x1004 * sizeof(Tokenlist)); unsigned int tokensSize = 0x1004 * sizeof(Tokenlist);
Tokenlist *tokens = (Tokenlist *)malloc(tokensSize);
if (!stak || !tokens) { if (!stak || !tokens) {
free(stak); free(stak);
free(tokens); free(tokens);
@ -265,7 +266,7 @@ int DecompressorLZW::unpackLZW1(Common::ReadStream *src, byte *dest, uint32 nPac
error("[DecompressorLZW::unpackLZW1] Cannot allocate decompression buffers"); error("[DecompressorLZW::unpackLZW1] Cannot allocate decompression buffers");
} }
memset(tokens, 0, sizeof(tokens)); memset(tokens, 0, tokensSize);
byte lastchar = 0; byte lastchar = 0;
uint16 stakptr = 0, lastbits = 0; uint16 stakptr = 0, lastbits = 0;

2
engines/sci/engine/vm.cpp
View file

@ -462,7 +462,7 @@ int readPMachineInstruction(const byte *src, byte &extOpcode, int16 opparams[4])
extOpcode = src[offset++]; // Get "extended" opcode (lower bit has special meaning) extOpcode = src[offset++]; // Get "extended" opcode (lower bit has special meaning)
const byte opcode = extOpcode >> 1; // get the actual opcode const byte opcode = extOpcode >> 1; // get the actual opcode
memset(opparams, 0, sizeof(opparams)); memset(opparams, 0, 4*sizeof(int16));
for (int i = 0; g_opcode_formats[opcode][i]; ++i) { for (int i = 0; g_opcode_formats[opcode][i]; ++i) {
//debugN("Opcode: 0x%x, Opnumber: 0x%x, temp: %d\n", opcode, opcode, temp); //debugN("Opcode: 0x%x, Opnumber: 0x%x, temp: %d\n", opcode, opcode, temp);