[Scummvm-cvs-logs] CVS: scummvm/scumm script_v100he.cpp,2.126,2.127 script_v72he.cpp,2.261,2.262

kirben kirben at users.sourceforge.net
Sun Apr 17 07:21:50 CEST 2005


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19714/scumm

Modified Files:
	script_v100he.cpp script_v72he.cpp 
Log Message:

Fix buffer overflow regression.
Use same buffer sizes as original.


Index: script_v100he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v100he.cpp,v
retrieving revision 2.126
retrieving revision 2.127
diff -u -d -r2.126 -r2.127
--- script_v100he.cpp	17 Apr 2005 12:55:41 -0000	2.126
+++ script_v100he.cpp	17 Apr 2005 14:20:43 -0000	2.127
@@ -585,7 +585,7 @@
 	int id, len, b, c;
 	ArrayHeader *ah;
 	int list[128];
-	byte string[2048];
+	byte string[1024];
 
 	debug(1,"o100_arrayOps: case %d", subOp);
 	switch (subOp) {

Index: script_v72he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v72he.cpp,v
retrieving revision 2.261
retrieving revision 2.262
diff -u -d -r2.261 -r2.262
--- script_v72he.cpp	17 Apr 2005 12:55:42 -0000	2.261
+++ script_v72he.cpp	17 Apr 2005 14:20:44 -0000	2.262
@@ -519,7 +519,7 @@
 }
 
 void ScummEngine_v72he::copyScriptString(byte *dst, int dstSize) {
-	byte string[256];
+	byte string[1024];
 	byte chr;
 	int pos = 0;
 
@@ -560,7 +560,7 @@
 	const byte *src;
 	int args[31];
 	int num, len, val;
-	byte chr, string[256];
+	byte chr, string[1024];
 	memset(args, 0, sizeof(args));
 	memset(string, 0, sizeof(string));
 
@@ -1411,7 +1411,7 @@
 	int id, len, b, c;
 	ArrayHeader *ah;
 	int list[128];
-	byte string[2048];
+	byte string[1024];
 
 
 	debug(1,"o72_arrayOps: case %d", subOp);
@@ -1844,14 +1844,14 @@
 }
 
 void ScummEngine_v72he::o72_deleteFile() {
-	byte filename[100];
+	byte filename[256];
 
 	copyScriptString(filename, sizeof(filename));
 	debug(1, "stub o72_deleteFile(%s)", filename);
 }
 
 void ScummEngine_v72he::o72_rename() {
-	byte oldFilename[256],newFilename[256];
+	byte oldFilename[100],newFilename[100];
 
 	copyScriptString(newFilename, sizeof(newFilename));
 	copyScriptString(oldFilename, sizeof(oldFilename));
@@ -2091,7 +2091,7 @@
 }
 
 void ScummEngine_v72he::o72_readINI() {
-	byte option[100];
+	byte option[128];
 	ArrayHeader *ah;
 	const char *entry;
 	int len, type;
@@ -2172,13 +2172,13 @@
 
 void ScummEngine_v72he::o72_setFilePath() {
 	// File related
-	byte filename[100];
+	byte filename[255];
 	copyScriptString(filename, sizeof(filename));
 	debug(1,"o72_setFilePath: %s", filename);
 }
 
 void ScummEngine_v72he::o72_setWindowCaption() {
-	byte name[100];
+	byte name[1024];
 	copyScriptString(name, sizeof(name));
 	int id = fetchScriptByte();
 





More information about the Scummvm-git-logs mailing list