[Gnash-commit] gnash ChangeLog libbase/log.cpp

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/06/10 11:45:39

Modified files:
        .              : ChangeLog 
        libbase        : log.cpp 

Log message:
        Avoid buffer overflows

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.398&r2=1.399
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/log.cpp?cvsroot=gnash&r1=1.11&r2=1.12

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.398
retrieving revision 1.399
diff -u -b -r1.398 -r1.399
--- ChangeLog   8 Jun 2006 20:35:06 -0000       1.398
+++ ChangeLog   10 Jun 2006 11:45:39 -0000      1.399
@@ -1,3 +1,7 @@
+2006-06-10 Sandro Santilli <address@hidden>
+
+       * libbase/log.cpp: avoid buffer overflows.
+
 2006-06-08 Sandro Santilli <address@hidden>
 
        * server/impl.cpp: save URL::str() return into a local variable.

Index: libbase/log.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/log.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- libbase/log.cpp     9 Jun 2006 14:51:41 -0000       1.11
+++ libbase/log.cpp     10 Jun 2006 11:45:39 -0000      1.12
@@ -169,6 +169,7 @@
 
     va_start (ap, fmt);
     vsnprintf (tmp, BUFFER_SIZE, fmt, ap);
+    tmp[BUFFER_SIZE-1] = '\0';
 
                dbglogfile << tmp << endl;
     
@@ -180,10 +181,11 @@
 {
     va_list ap;
     char tmp[BUFFER_SIZE];
-    memset(tmp, 0, BUFFER_SIZE);
     
     va_start (ap, fmt);
-    vsprintf (tmp, fmt, ap);
+    //vsprintf (tmp, fmt, ap);
+    vsnprintf (tmp, BUFFER_SIZE, fmt, ap);
+    tmp[BUFFER_SIZE-1] = '\0';
     
     dbglogfile << "TRACE: " << tmp << endl;
     
@@ -195,10 +197,10 @@
 {
     va_list ap;
     char tmp[BUFFER_SIZE];
-    memset(tmp, 0, BUFFER_SIZE);
 
     va_start (ap, fmt);
-    vsprintf (tmp, fmt, ap);
+    vsnprintf (tmp, BUFFER_SIZE, fmt, ap);
+    tmp[BUFFER_SIZE-1] = '\0';
 
     bool stamp = dbglogfile.getStamp();
     dbglogfile.setStamp(false);
@@ -215,10 +217,10 @@
 {
     va_list ap;
     char tmp[BUFFER_SIZE];
-    memset(tmp, 0, BUFFER_SIZE);
 
     va_start (ap, fmt);
-    vsprintf (tmp, fmt, ap);
+    vsnprintf (tmp, BUFFER_SIZE, fmt, ap);
+    tmp[BUFFER_SIZE-1] = '\0';
 
     if (dbglogfile.getParserDump()) {
        dbglogfile << tmp << endl;
@@ -233,10 +235,10 @@
 {
     va_list ap;
     char tmp[BUFFER_SIZE];
-    memset(tmp, 0, BUFFER_SIZE);
 
     va_start (ap, fmt);
-    vsprintf (tmp, fmt, ap);
+    vsnprintf (tmp, BUFFER_SIZE, fmt, ap);
+    tmp[BUFFER_SIZE-1] = '\0';
 
     dbglogfile << "ERROR: " << tmp << endl;
     
@@ -250,7 +252,8 @@
     char tmp[BUFFER_SIZE];
     
     va_start (ap, fmt);
-    vsprintf (tmp, fmt, ap);
+    vsnprintf (tmp, BUFFER_SIZE-1, fmt, ap);
+    tmp[BUFFER_SIZE-1] = '\0';
     
     dbglogfile << "WARNING: " << tmp << endl;