You are viewing a plain text version of this content. The canonical link for it is here.
Posted to log4cxx-dev@logging.apache.org by ca...@apache.org on 2005/06/01 23:29:18 UTC
cvs commit: logging-log4cxx/tests/src/rolling obsoleterollingfileappendertest.cpp
carnold 2005/06/01 14:29:18
Modified: src charsetdecoder.cpp simpledateformat.cpp
tests/src/rolling obsoleterollingfileappendertest.cpp
Log:
LOGCXX-52: Uninitialized variables
Revision Changes Path
1.8 +1 -0 logging-log4cxx/src/charsetdecoder.cpp
Index: charsetdecoder.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/src/charsetdecoder.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- charsetdecoder.cpp 7 May 2005 15:12:15 -0000 1.7
+++ charsetdecoder.cpp 1 Jun 2005 21:29:18 -0000 1.8
@@ -156,6 +156,7 @@
wchar_t buf[BUFSIZE];
mbstate_t mbstate;
+ memset(&mbstate, 0, sizeof(mbstate));
while(in.remaining() > 0) {
size_t requested = in.remaining();
1.19 +11 -10 logging-log4cxx/src/simpledateformat.cpp
Index: simpledateformat.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/src/simpledateformat.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- simpledateformat.cpp 7 May 2005 15:12:15 -0000 1.18
+++ simpledateformat.cpp 1 Jun 2005 21:29:18 -0000 1.19
@@ -81,7 +81,8 @@
BUFSIZE = 256
};
char buf[BUFSIZE];
- apr_size_t retsize;
+ memset(buf, 0, BUFSIZE);
+ apr_size_t retsize = 0;
apr_status_t stat = apr_strftime( buf, & retsize, BUFSIZE, format, tm );
if ( stat != APR_SUCCESS )
{
@@ -214,7 +215,7 @@
}
#endif
apr_time_exp_t time;
- memset( & time, sizeof( time ), 0 );
+ memset( & time, 0, sizeof( time ));
for ( int imon = 0; imon < 12; imon++ )
{
time.tm_mon = imon;
@@ -243,7 +244,7 @@
if ( locale != NULL )
{
tm time;
- memset( & time, sizeof( time ), 0 );
+ memset( & time, 0, sizeof( time ));
std::basic_ostringstream < localechar > buffer;
size_t start = 0;
for ( int imon = 0; imon < 12; imon++ )
@@ -258,7 +259,7 @@
}
#endif
apr_time_exp_t time;
- memset( & time, sizeof( time ), 0 );
+ memset( & time, 0, sizeof( time ));
for ( int imon = 0; imon < 12; imon++ )
{
time.tm_mon = imon;
@@ -362,7 +363,7 @@
if ( locale != NULL )
{
tm time;
- memset( & time, sizeof( time ), 0 );
+ memset( & time, 0, sizeof( time ));
std::basic_ostringstream < localechar > buffer;
size_t start = 0;
for ( int iday = 0; iday < 7; iday++ )
@@ -377,7 +378,7 @@
}
#endif
apr_time_exp_t time;
- memset( & time, sizeof( time ), 0 );
+ memset( & time, 0, sizeof( time ));
for ( int iday = 0; iday < 7; iday++ )
{
time.tm_wday = iday;
@@ -406,7 +407,7 @@
if ( locale != NULL )
{
tm time;
- memset( & time, sizeof( time ), 0 );
+ memset( & time, 0, sizeof( time ));
std::basic_ostringstream < localechar > buffer;
size_t start = 0;
for ( int iday = 0; iday < 7; iday++ )
@@ -421,7 +422,7 @@
}
#endif
apr_time_exp_t time;
- memset( & time, sizeof( time ), 0 );
+ memset( & time, 0, sizeof( time ));
for ( int iday = 0; iday < 7; iday++ )
{
time.tm_wday = iday;
@@ -531,7 +532,7 @@
if ( locale != NULL )
{
tm time;
- memset( & time, sizeof( time ), 0 );
+ memset( & time, 0, sizeof( time ));
std::basic_ostringstream < localechar > buffer;
size_t start = 0;
for ( int i = 0; i < 2; i++ )
@@ -546,7 +547,7 @@
}
#endif
apr_time_exp_t time;
- memset( & time, sizeof( time ), 0 );
+ memset( & time, 0, sizeof( time ));
for ( int i = 0; i < 2; i++ )
{
time.tm_hour = i * 12;
1.2 +4 -4 logging-log4cxx/tests/src/rolling/obsoleterollingfileappendertest.cpp
Index: obsoleterollingfileappendertest.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/tests/src/rolling/obsoleterollingfileappendertest.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- obsoleterollingfileappendertest.cpp 1 Jun 2005 18:40:27 -0000 1.1
+++ obsoleterollingfileappendertest.cpp 1 Jun 2005 21:29:18 -0000 1.2
@@ -107,7 +107,7 @@
LoggerPtr root(Logger::getRootLogger());
root->addAppender(rfa);
- char msg[11];
+ char msg[10];
strcpy(msg, "Hello---?");
LoggerPtr logger(Logger::getLogger("org.apache.logj4.ObsoleteRollingFileAppenderTest"));
@@ -116,11 +116,11 @@
apr_sleep(100000);
if (i < 10) {
- msg[9] = (char) ('0' + i);
+ msg[8] = (char) ('0' + i);
LOG4CXX_DEBUG(logger, msg);
} else if (i < 100) {
- msg[8] = (char) ('0' + i / 10);
- msg[9] = (char) ('0' + i % 10);
+ msg[7] = (char) ('0' + i / 10);
+ msg[8] = (char) ('0' + i % 10);
LOG4CXX_DEBUG(logger, msg);
}
}