[Scummvm-cvs-logs] SF.net SVN: scummvm:[51440] tools/branches/gsoc2010-decompiler/decompiler/ kyra/disassembler.cpp

[pidgeot at users.sourceforge.net]

Revision: 51440
          http://scummvm.svn.sourceforge.net/scummvm/?rev=51440&view=rev
Author:   pidgeot
Date:     2010-07-28 22:05:15 +0000 (Wed, 28 Jul 2010)

Log Message:
-----------
Fix segfault in KYRA disassembler

Modified Paths:
--------------
    tools/branches/gsoc2010-decompiler/decompiler/kyra/disassembler.cpp

Modified: tools/branches/gsoc2010-decompiler/decompiler/kyra/disassembler.cpp
===================================================================
--- tools/branches/gsoc2010-decompiler/decompiler/kyra/disassembler.cpp	2010-07-28 22:01:19 UTC (rev 51439)
+++ tools/branches/gsoc2010-decompiler/decompiler/kyra/disassembler.cpp	2010-07-28 22:05:15 UTC (rev 51440)
@@ -30,11 +30,11 @@
 
 Kyra::Disassembler::~Disassembler() {
 	if (_textChunk._data)
-		delete [] _textChunk._data;
+		delete[] _textChunk._data;
 	if (_ordrChunk._data)
-		delete [] _ordrChunk._data;
+		delete[] _ordrChunk._data;
 	if (_dataChunk._data)
-		delete [] _dataChunk._data;
+		delete[] _dataChunk._data;
 }
 
 void Kyra::Disassembler::doDisassemble() throw(UnknownOpcodeException) {
@@ -47,7 +47,7 @@
 	}
 	_f.readUint32BE(); // Skip file length
 	_formType = _f.readUint32BE();
-	if (_formType != MKID_BE('EMC2')) {
+	f (_formType != MKID_BE('EMC2')) {
 		std::cerr << boost::format("ERROR: Unexpected file type 0x%08X (expected 0x%08X)!\n") % _formType % MKID_BE('EMC2');
 		return;
 	}
@@ -58,7 +58,7 @@
 		temp._chunkType = _f.readUint32BE();
 		temp._size = _f.readUint32BE();
 		temp._data = new uint8[temp._size];
-		_f.read_throwsOnError(&temp._data, temp._size);
+		_f.read_throwsOnError(temp._data, temp._size);
 		switch (temp._chunkType) {
 		case MKID_BE('TEXT'):
 			_textChunk = temp;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.