summaryrefslogtreecommitdiffstats
path: root/src/corelib
diff options
context:
space:
mode:
authorHarald Fernengel <harald@trolltech.com>2009-06-10 14:38:16 (GMT)
committerHarald Fernengel <harald@trolltech.com>2009-06-10 14:38:16 (GMT)
commite34151121a3faf3c55853bd6dc23ad645a036a6d (patch)
tree79faebc936d19f03f726a7bcf57310838186d82f /src/corelib
parent57c434c3fdf53e99b88646496e154708b3c141f5 (diff)
parent5fcc4febed6f88790d80f7869b647629f7e294af (diff)
downloadQt-e34151121a3faf3c55853bd6dc23ad645a036a6d.zip
Qt-e34151121a3faf3c55853bd6dc23ad645a036a6d.tar.gz
Qt-e34151121a3faf3c55853bd6dc23ad645a036a6d.tar.bz2
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public
Diffstat (limited to 'src/corelib')
-rw-r--r--src/corelib/global/qglobal.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp
index e493831..bd6e1f1 100644
--- a/src/corelib/global/qglobal.cpp
+++ b/src/corelib/global/qglobal.cpp
@@ -2207,10 +2207,10 @@ void qt_message_output(QtMsgType msgType, const char *buf)
*/
static void qEmergencyOut(QtMsgType msgType, const char *msg, va_list ap)
{
- char emergency_buf[1024] = { '\0' };
- emergency_buf[1023] = '\0';
+ char emergency_buf[256] = { '\0' };
+ emergency_buf[255] = '\0';
if (msg)
- qvsnprintf(emergency_buf, 1023, msg, ap);
+ qvsnprintf(emergency_buf, 255, msg, ap);
qt_message_output(msgType, emergency_buf);
}
#endif