[Scummvm-cvs-logs] CVS: scummvm/base engine.cpp,1.34,1.35 main.cpp,1.69,1.70

Eugene Sandulenko sev at users.sourceforge.net
Wed Jan 26 03:02:08 CET 2005


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

Modified Files:
	engine.cpp main.cpp 
Log Message:
Fix bug #1109687 buffer overflow causes crash from env-var HOME and some
other places with such overflows.


Index: engine.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/base/engine.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- engine.cpp	10 Jan 2005 22:18:37 -0000	1.34
+++ engine.cpp	26 Jan 2005 11:01:35 -0000	1.35
@@ -139,7 +139,7 @@
 	va_list va;
 
 	va_start(va, s);
-	vsprintf(buf, s, va);
+	vsnprintf(buf, STRINGBUFLEN, s, va);
 	va_end(va);
 
 #ifdef __GP32__ //ph0x FIXME: implement fprint?

Index: main.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/base/main.cpp,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -d -r1.69 -r1.70
--- main.cpp	10 Jan 2005 22:05:35 -0000	1.69
+++ main.cpp	26 Jan 2005 11:01:41 -0000	1.70
@@ -461,7 +461,7 @@
 		return;
 
 	va_start(va, s);
-	vsprintf(buf, s, va);
+	vsnprintf(buf, STRINGBUFLEN, s, va);
 	va_end(va);
 	
 	debugHelper(buf);
@@ -472,7 +472,7 @@
 	va_list va;
 
 	va_start(va, s);
-	vsprintf(buf, s, va);
+	vsnprintf(buf, STRINGBUFLEN, s, va);
 	va_end(va);
 
 	debugHelper(buf);





More information about the Scummvm-git-logs mailing list