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

Make sure that enough data is read out of the script

Browse source 
svn-id: r46785
This commit is contained in:
Sven Hesse 2009-12-31 00:06:28 +00:00
parent 9c430b5298
commit 5c52ed9f4b
1 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

18
engines/gob/script.cpp
View file

@ -155,9 +155,11 @@ byte *Script::getData() {
}
byte Script::readByte() {
byte v;
byte v = 0;
uint32 n;
read(&v, 1);
n = read(&v, 1);
assert(n == 1);
return v;
}
@ -171,17 +173,21 @@ uint8 Script::readUint8() {
}
uint16 Script::readUint16() {
byte v[2];
byte v[2] = {0, 0};
uint32 n;
read(v, 2);
n = read(v, 2);
assert(n == 2);
return READ_LE_UINT16(v);
}
uint32 Script::readUint32() {
byte v[4];
byte v[4] = {0, 0, 0, 0};
uint32 n;
read(v, 4);
n = read(v, 4);
assert(n == 4);
return READ_LE_UINT32(v);
}