[Scummvm-cvs-logs] SF.net SVN: scummvm:[46403] tools/branches/gsoc2009-gui/extract_zak_c64.cpp

[Hkz at users.sourceforge.net]

Revision: 46403
          http://scummvm.svn.sourceforge.net/scummvm/?rev=46403&view=rev
Author:   Hkz
Date:     2009-12-17 15:10:24 +0000 (Thu, 17 Dec 2009)

Log Message:
-----------
Fix segmentation fault in extract_zak_c64

Modified Paths:
--------------
    tools/branches/gsoc2009-gui/extract_zak_c64.cpp

Modified: tools/branches/gsoc2009-gui/extract_zak_c64.cpp
===================================================================
--- tools/branches/gsoc2009-gui/extract_zak_c64.cpp	2009-12-17 07:55:08 UTC (rev 46402)
+++ tools/branches/gsoc2009-gui/extract_zak_c64.cpp	2009-12-17 15:10:24 UTC (rev 46403)
@@ -44,10 +44,14 @@
 };
 
 ExtractZakC64::ExtractZakC64(const std::string &name) : Tool(name, TOOLTYPE_EXTRACTION) {
-	ToolInput input;
-	input.format = "*.d64";
-	_inputPaths.push_back(input);
+	ToolInput input1;
+	input1.format = "*.d64";
+	_inputPaths.push_back(input1);
 
+	ToolInput input2;
+	input2.format = "*.d64";
+	_inputPaths.push_back(input2);
+
 	_shorthelp = "Extract Zak McKraken data files from the C64 version.";
 	_helptext = "\nUsage: " + _name + " [-o <output dir> = out/] <disk1.d64> <disk2.d64>\n\t" + _shorthelp + "\n";
 }
@@ -55,9 +59,8 @@
 void ExtractZakC64::execute() {
 	int i, j;
 	unsigned short signature;
+	char fname[256];
 
-	char fname[1024];
-
 	// Two disks...
 	Filename inpath1(_inputPaths[0].path);
 	Filename inpath2(_inputPaths[1].path);
@@ -81,7 +84,6 @@
 	outpath.setFullName("00.LFL");
 	File output(outpath, "wb");
 	output.setXorMode(0xFF);
-	error("Unable to create index file!");
 	print("Creating 00.LFL...");
 
 	/* write signature */


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