libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-16 06:39:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

SCI32: Fix kFileIOReadRaw when fewer bytes than requested

Browse Source 
Fixes censorship password in Phantasmagoria 1
This commit is contained in:
sluicebox 2019-11-25 16:18:53 -08:00
parent df41cb125f
commit b658ef31de
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
engines/sci/engine/kfile.cpp
View File

@ -586,18 +586,15 @@ reg_t kFileIOReadRaw(EngineState *s, int argc, reg_t *argv) {
uint16 handle = argv[0].toUint16();
uint16 size = argv[2].toUint16();
int bytesRead = 0;
char *buf = new char[size];
byte *buf = new byte[size];
debugC(kDebugLevelFile, "kFileIO(readRaw): %d, %d", handle, size);
FileHandle *f = getFileFromHandle(s, handle);
if (f)
bytesRead = f->_in->read(buf, size);
// TODO: What happens if less bytes are read than what has
// been requested? (i.e. if bytesRead is non-zero, but still
// less than size)
if (bytesRead > 0)
s->_segMan->memcpy(argv[1], (const byte*)buf, size);
s->_segMan->memcpy(argv[1], buf, bytesRead);
delete[] buf;
return make_reg(0, bytesRead);