Merge branch '0.5'

Conflicts:
	CMakeLists.txt
	po/fi.po
	po/fr.po
	src/gui/skilldialog.cpp
	src/localplayer.cpp
	src/net/manaserv/generalhandler.cpp
	src/net/tmwa/buysellhandler.cpp
	src/net/tmwa/generalhandler.cpp
	src/net/tmwa/playerhandler.cpp
	src/net/tmwa/specialhandler.cpp
	src/winver.h

1 files changed, 3 insertions, 2 deletions

diff --git a/src/log.cpp b/src/log.cpp
index a147c107..bb8a78bb 100644
--- a/src/log.cpp
+++ b/src/log.cpp
@@ -60,12 +60,13 @@ void Logger::setLogFile(const std::string &logFilename)
 
 void Logger::log(const char *log_text, ...)
 {
-    char* buf = new char[1024];
+    const size_t bufSize = 1024;
+    char* buf = new char[bufSize];
     va_list ap;
 
     // Use a temporary buffer to fill in the variables
     va_start(ap, log_text);
-    vsprintf(buf, log_text, ap);
+    vsnprintf(buf, bufSize, log_text, ap);
     va_end(ap);
 
     // Get the current system time