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

ULTIMA8: Free the correct pointer in ~OAutoBufferDataSource

Browse Source 
Also add a unit test for the class to make sure the problem
is fixed.
This commit is contained in:
Matthew Duggan 2020-03-02 15:30:53 +09:00 committed by Filippos Karapetis
parent 828c673492
commit 896d281ddc
2 changed files with 75 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engines/ultima/ultima8/filesys/odata_source.h
View File

@ -359,7 +359,7 @@ public:
}
~OAutoBufferDataSource() override {
delete [] _bufPtr;
delete [] _buf;
}
void write1(uint32 val) override {

74
test/engines/ultima/ultima8/filesys/odata_source.h Normal file
View File

@ -0,0 +1,74 @@
#include <cxxtest/TestSuite.h>
#include "engines/ultima/ultima8/filesys/odata_source.h"
/**
* Test suite for the functions in engines/ultima/ultima8/filesys/odata_source.h
*/
class U8ODataSourceTestSuite : public CxxTest::TestSuite {
public:
U8ODataSourceTestSuite() {
}
void test_autobuffer_source() {
Ultima::Ultima8::OAutoBufferDataSource source(12);
TS_ASSERT_EQUALS(source.getSize(), 0);
TS_ASSERT_EQUALS(source.getPos(), 0);
source.write1(0xBEEF);
TS_ASSERT_EQUALS(source.getSize(), 1);
TS_ASSERT_EQUALS(source.getPos(), 1);
for (int i = 0; i < 10; i++) {
source.write4(0x8088C0DE);
}
TS_ASSERT_EQUALS(source.getSize(), 41);
TS_ASSERT_EQUALS(source.getPos(), 41);
source.skip(0);
TS_ASSERT_EQUALS(source.getSize(), 41);
TS_ASSERT_EQUALS(source.getPos(), 41);
// Check trying to skip past the end
source.skip(2);
TS_ASSERT_EQUALS(source.getSize(), 41);
TS_ASSERT_EQUALS(source.getPos(), 41);
source.skip(-2);
TS_ASSERT_EQUALS(source.getPos(), 39);
source.write1(0x99);
TS_ASSERT_EQUALS(source.getSize(), 41);
TS_ASSERT_EQUALS(source.getPos(), 40);
source.seek(2);
TS_ASSERT_EQUALS(source.getSize(), 41);
TS_ASSERT_EQUALS(source.getPos(), 2);
const uint8* buf = source.getBuf();
TS_ASSERT_EQUALS(buf[0], 0xEF);
TS_ASSERT_EQUALS(buf[1], 0xDE);
TS_ASSERT_EQUALS(buf[2], 0xC0);
TS_ASSERT_EQUALS(buf[3], 0x88);
TS_ASSERT_EQUALS(buf[23], 0x88);
TS_ASSERT_EQUALS(buf[24], 0x80);
TS_ASSERT_EQUALS(buf[35], 0x88);
TS_ASSERT_EQUALS(buf[36], 0x80);
source.clear();
TS_ASSERT_EQUALS(source.getSize(), 0);
TS_ASSERT_EQUALS(source.getPos(), 0);
source.write1(0x04030201);
source.write2(0x08070605);
source.write3(0x0C0B0A09);
source.write4(0x100F0E0D);
buf = source.getBuf();
TS_ASSERT_EQUALS(buf[0], 0x01);
TS_ASSERT_EQUALS(buf[1], 0x05);
TS_ASSERT_EQUALS(buf[2], 0x06);
TS_ASSERT_EQUALS(buf[3], 0x09);
TS_ASSERT_EQUALS(buf[4], 0x0A);
TS_ASSERT_EQUALS(buf[5], 0x0B);
TS_ASSERT_EQUALS(buf[6], 0x0D);
TS_ASSERT_EQUALS(buf[7], 0x0E);
TS_ASSERT_EQUALS(buf[8], 0x0F);
TS_ASSERT_EQUALS(buf[9], 0x10);
}
};