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

- Fixed mismatching malloc/delete[]

Browse source 
- More formatting fixes

svn-id: r32255
This commit is contained in:
Johannes Schickel 2008-05-24 19:18:17 +00:00
parent 85e6b8bb0f
commit 0897a3a058
1 changed files with 21 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

42
engines/kyra/resource.cpp
View file

@ -1127,23 +1127,23 @@ bool ResLoaderInsHof::loadFile(const Common::String &filename, Common::SeekableR
uint32 bytesleft = 0; uint32 bytesleft = 0;
bool startFile = true; bool startFile = true;
Common::String fn_base(filename.c_str(), 10); Common::String filenameBase(filename.c_str(), 10);
Common::String fn_tmp; Common::String filenameTemp;
char fn_ext[4]; char filenameExt[4];
while (fn_base.lastChar() != '.') while (filenameBase.lastChar() != '.')
fn_base.deleteLastChar(); filenameBase.deleteLastChar();
InsHofArchive newArchive; InsHofArchive newArchive;
Common::List<InsHofArchive> archives; Common::List<InsHofArchive> archives;
for (int8 currentFile = 1; currentFile; currentFile++) { for (int8 currentFile = 1; currentFile; currentFile++) {
sprintf(fn_ext, "%03d", currentFile); sprintf(filenameExt, "%03d", currentFile);
fn_tmp = fn_base + Common::String(fn_ext); filenameTemp = filenameBase + Common::String(filenameExt);
if (!tmpFile.open(fn_tmp)) { if (!tmpFile.open(filenameTemp)) {
debug(3, "couldn't open file '%s'\n", fn_tmp.c_str()); debug(3, "couldn't open file '%s'\n", filenameTemp.c_str());
break; break;
} }
@ -1161,7 +1161,7 @@ bool ResLoaderInsHof::loadFile(const Common::String &filename, Common::SeekableR
} else { } else {
size = size + 1 - pos; size = size + 1 - pos;
} }
newArchive.filename = fn_base; newArchive.filename = filenameBase;
bytesleft = newArchive.totalSize = tmpFile.readUint32LE(); bytesleft = newArchive.totalSize = tmpFile.readUint32LE();
pos += 4; pos += 4;
newArchive.firstFile = currentFile; newArchive.firstFile = currentFile;
@ -1203,11 +1203,11 @@ bool ResLoaderInsHof::loadFile(const Common::String &filename, Common::SeekableR
for (Common::List<InsHofArchive>::iterator a = archives.begin(); a != archives.end(); ++a) { for (Common::List<InsHofArchive>::iterator a = archives.begin(); a != archives.end(); ++a) {
startFile = true; startFile = true;
for (uint32 i = a->firstFile; i != (a->lastFile + 1); i++) { for (uint32 i = a->firstFile; i != (a->lastFile + 1); i++) {
sprintf(fn_ext, "%03d", i); sprintf(filenameExt, "%03d", i);
fn_tmp = a->filename + Common::String(fn_ext); filenameTemp = a->filename + Common::String(filenameExt);
if (!tmpFile.open(fn_tmp)) { if (!tmpFile.open(filenameTemp)) {
debug(3, "couldn't open file '%s'\n", fn_tmp.c_str()); debug(3, "couldn't open file '%s'\n", filenameTemp.c_str());
break; break;
} }
@ -1244,12 +1244,11 @@ bool ResLoaderInsHof::loadFile(const Common::String &filename, Common::SeekableR
} }
} }
sprintf(filenameExt, "%03d", i + 1);
sprintf(fn_ext, "%03d", i + 1); filenameTemp = a->filename + Common::String(filenameExt);
fn_tmp = a->filename + Common::String(fn_ext);
Common::File tmpFile2; Common::File tmpFile2;
tmpFile2.open(fn_tmp); tmpFile2.open(filenameTemp);
tmpFile.read(hdr, m); tmpFile.read(hdr, m);
tmpFile2.read(hdr + m, b); tmpFile2.read(hdr + m, b);
tmpFile2.close(); tmpFile2.close();
@ -1277,7 +1276,7 @@ bool ResLoaderInsHof::loadFile(const Common::String &filename, Common::SeekableR
newEntry.preload = false; newEntry.preload = false;
newEntry.prot = false; newEntry.prot = false;
newEntry.fileIndex = i; newEntry.fileIndex = i;
files.push_back(File(Common::String((const char*) (hdr + 30)), newEntry)); files.push_back(File(Common::String((const char *)(hdr + 30)), newEntry));
pos += newEntry.compressedSize; pos += newEntry.compressedSize;
if (pos > size) { if (pos > size) {
@ -1304,7 +1303,7 @@ Common::SeekableReadStream *ResLoaderInsHof::loadFileFromArchive(const Common::S
archive = 0; archive = 0;
} }
uint8 * outbuffer = (uint8*) malloc(entry.size); uint8 *outbuffer = (uint8 *)malloc(entry.size);
assert(outbuffer); assert(outbuffer);
if (!_fileCache.getData(entry, outbuffer)) { if (!_fileCache.getData(entry, outbuffer)) {
@ -1313,7 +1312,7 @@ Common::SeekableReadStream *ResLoaderInsHof::loadFileFromArchive(const Common::S
sprintf(filename, "WESTWOOD.%03d", entry.fileIndex); sprintf(filename, "WESTWOOD.%03d", entry.fileIndex);
if (!tmpFile.open(filename)) { if (!tmpFile.open(filename)) {
delete [] outbuffer; free(outbuffer);
return 0; return 0;
} }
@ -1336,7 +1335,6 @@ Common::SeekableReadStream *ResLoaderInsHof::loadFileFromArchive(const Common::S
return 0; return 0;
tmpFile.seek(1); tmpFile.seek(1);
tmpFile.read(inbuffer + a, b); tmpFile.read(inbuffer + a, b);
} else { } else {
tmpFile.read(inbuffer, entry.compressedSize); tmpFile.read(inbuffer, entry.compressedSize);
} }