aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEugene Sandulenko2005-01-26 11:01:41 +0000
committerEugene Sandulenko2005-01-26 11:01:41 +0000
commit284c209badda4793be651f0d3483044694419d91 (patch)
treed9676501d05f7ffc9ee3d74fdbdea9869acd61c3
parent065a27daab1ef753f9b1e9c28d7d8d3c2c25e7a2 (diff)
downloadscummvm-rg350-284c209badda4793be651f0d3483044694419d91.tar.gz
scummvm-rg350-284c209badda4793be651f0d3483044694419d91.tar.bz2
scummvm-rg350-284c209badda4793be651f0d3483044694419d91.zip
Fix bug #1109687 buffer overflow causes crash from env-var HOME and some
other places with such overflows. svn-id: r16640
-rw-r--r--base/engine.cpp2
-rw-r--r--base/main.cpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/base/engine.cpp b/base/engine.cpp
index ff574c6179..cfea95c193 100644
--- a/base/engine.cpp
+++ b/base/engine.cpp
@@ -139,7 +139,7 @@ void CDECL warning(const char *s, ...) {
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?
diff --git a/base/main.cpp b/base/main.cpp
index 51ca83fe0f..fc9fa4eaea 100644
--- a/base/main.cpp
+++ b/base/main.cpp
@@ -461,7 +461,7 @@ void CDECL debug(int level, const char *s, ...) {
return;
va_start(va, s);
- vsprintf(buf, s, va);
+ vsnprintf(buf, STRINGBUFLEN, s, va);
va_end(va);
debugHelper(buf);
@@ -472,7 +472,7 @@ void CDECL debug(const char *s, ...) {
va_list va;
va_start(va, s);
- vsprintf(buf, s, va);
+ vsnprintf(buf, STRINGBUFLEN, s, va);
va_end(va);
debugHelper(buf);