libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-21 01:05:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

the _encbyte code was evil, because it modified the memory passed to write(); worse, though, it incremented ptr2, which then was later passed to fwrite - hence if used to write something while _encbyte != 0, write() resulted in wrong data being written

Browse Source 
svn-id: r8055
This commit is contained in:
Max Horn 2003-05-28 19:03:12 +00:00
parent 798d23c6a8
commit 2dd2e99cab
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
common/file.cpp
View File

@ -266,9 +266,9 @@ uint32 File::readUint32BE() {
return (b << 16) | a;
}
uint32 File::write(void *ptr, uint32 len) {
byte *ptr2 = (byte *)ptr;
uint32 File::write(const void *ptr, uint32 len) {
byte *tmp = 0;
if (_handle == NULL) {
error("File is not open!");
return 0;
@ -281,17 +281,22 @@ uint32 File::write(void *ptr, uint32 len) {
// Maybe FIXME: while it's efficient to do the encoding here,
// it not really nice for a write function to modify its input.
// Maybe we should work on a copy here...
uint32 t_size = len;
do {
*ptr2++ ^= _encbyte;
} while (--t_size);
tmp = (byte *)malloc(len);
for (uint32 i = 0; i < len; i ++) {
tmp[i] = ((const byte *)ptr)[i] ^ _encbyte;
}
ptr = tmp;
}
if ((uint32)fwrite(ptr2, 1, len, _handle) != len) {
if ((uint32)fwrite(ptr, 1, len, _handle) != len) {
clearerr(_handle);
_ioFailed = true;
}
if (_encbyte != 0) {
free(tmp);
}
return len;
}

2
common/file.h
View File

@ -60,7 +60,7 @@ public:
uint32 readUint32LE();
uint16 readUint16BE();
uint32 readUint32BE();
uint32 write(void *ptr, uint32 size);
uint32 write(const void *ptr, uint32 size);
void writeByte(byte value);
void writeUint16LE(uint16 value);
void writeUint32LE(uint32 value);