thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove usage of vsprintf in favour of vsnprintf and make

Browse source 
more use of STRINGBUFLEN.  Some ports may need a new stub for
this, discussed with Chrilith.

svn-id: r17463
This commit is contained in:
Jonathan Gray 2005-04-09 01:52:44 +00:00
parent aff66038f3
commit 24c92d0091
13 changed files with 18 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

2
backends/gp32/debug-gdbstub-usb.cpp
View file

@ -994,7 +994,7 @@ void DEBUG_Print(char *pFormat, ...)
if (!g_GDBConnected) return;
va_start(VaList , pFormat);
vsprintf(Temp , pFormat , VaList);
vsnprintf(Temp, 0x100, pFormat , VaList);
va_end(VaList);
iLength = strlen(Temp);

4
backends/gp32/gp32.cpp
View file

@ -2430,7 +2430,7 @@ int gpprintf(const char *fmt, ...) {
return 0;
busy = true;
va_start(marker, fmt);
vsprintf(s, fmt, marker);
vsnprintf(s, 1024, fmt, marker);
va_end(marker);
#ifdef GPDEBUG
@ -2460,7 +2460,7 @@ int gpfprintf(FILE *stream, const char *fmt, ...) {
va_list marker;
va_start(marker, fmt);
vsprintf(s, fmt, marker);
vsnprintf(s, 256, fmt, marker);
va_end(marker);
return fwrite(s, 1, strlen(s), stream);

2
backends/wince/missing/missing.cpp
View file

@ -567,7 +567,7 @@ int fprintf(FILE *stream, const char *format, ...) {
va_list va;
va_start(va, format);
vsprintf(buf, format, va);
vsnprintf(buf, 1024, format, va);
va_end(va);
if (buf[strlen(buf) - 1] == '\n') {

2
base/engine.cpp
View file

@ -92,7 +92,7 @@ void NORETURN CDECL error(const char *s, ...) {
va_list va;
va_start(va, s);
vsprintf(buf_input, s, va);
vsnprintf(buf_input, STRINGBUFLEN, s, va);
va_end(va);
if (g_engine) {

4
gob/debug.cpp
View file

@ -26,7 +26,7 @@
namespace Gob {
static int16 logFile = -2;
static char buf[256];
static char buf[STRINGBUFLEN];
extern uint32 always0_dword_23EC_560;
@ -50,7 +50,7 @@ void log_write(const char *format, ...) {
log_init();
if (logFile >= 0) {
vsprintf(buf, format, lst);
vsnprintf(buf, STRINGBUFLEN, format, lst);
write(logFile, buf, strlen(buf));
}

2
scumm/debugger.cpp
View file

@ -51,7 +51,7 @@ void CDECL debugC(int channel, const char *s, ...) {
return;
va_start(va, s);
vsprintf(buf, s, va);
vsnprintf(buf, STRINGBUFLEN, s, va);
va_end(va);
debug(buf);

2
scumm/scumm.cpp
View file

@ -2924,7 +2924,7 @@ char ScummEngine::displayMessage(const char *altButton, const char *message, ...
va_list va;
va_start(va, message);
vsprintf(buf, message, va);
vsnprintf(buf, STRINGBUFLEN, message, va);
va_end(va);
GUI::MessageDialog dialog(buf, "OK", altButton);

2
simon/charset.cpp
View file

@ -223,7 +223,7 @@ void SimonEngine::showMessageFormat(const char *s, ...) {
va_list va;
va_start(va, s);
vsprintf(buf, s, va);
vsnprintf(buf, STRINGBUFLEN, s, va);
va_end(va);
if (!_fcs_data_1[_fcs_unk_1]) {

8
sky/control.cpp
View file

@ -1053,15 +1053,11 @@ bool Control::loadSaveAllowed(void) {
}
int Control::displayMessage(const char *altButton, const char *message, ...) {
#ifdef __PALM_OS__
char buf[256]; // 1024 is too big overflow the stack
#else
char buf[1024];
#endif
char buf[STRINGBUFLEN];
va_list va;
va_start(va, message);
vsprintf(buf, message, va);
vsnprintf(buf, STRINGBUFLEN, message, va);
va_end(va);
GUI::MessageDialog dialog(buf, "OK", altButton);

2
sound/softsynth/mt32.cpp
View file

@ -174,7 +174,7 @@ static MT32Emu::File *MT32_OpenFile(void *userData, const char *filename, MT32Em
static void MT32_PrintDebug(void *userData, const char *fmt, va_list list) {
char buf[512];
if (((MidiDriver_MT32 *)userData)->_initialising) {
vsprintf(buf, fmt, list);
vsnprintf(buf, 512, fmt, list);
buf[70] = 0; // Truncate to a reasonable length
drawMessage(1, buf);
}

2
sword1/control.cpp
View file

@ -702,7 +702,7 @@ int Control::displayMessage(const char *altButton, const char *message, ...) {
va_list va;
va_start(va, message);
vsprintf(buf, message, va);
vsnprintf(buf, STRINGBUFLEN, message, va);
va_end(va);
GUI::MessageDialog dialog(buf, "OK", altButton);

4
tools/convbdf.c
View file

@ -101,7 +101,7 @@ void error(const char *s, ...) {
va_list va;
va_start(va, s);
vsprintf(buf, s, va);
vsnprintf(buf, 1024, s, va);
va_end(va);
fprintf(stderr, "ERROR: %s!\n", buf);
@ -114,7 +114,7 @@ void warning(const char *s, ...) {
va_list va;
va_start(va, s);
vsprintf(buf, s, va);
vsnprintf(buf, 1024, s, va);
va_end(va);
fprintf(stderr, "WARNING: %s!\n", buf);

4
tools/md5table.c
View file

@ -31,7 +31,7 @@ void error(const char *s, ...) {
va_list va;
va_start(va, s);
vsprintf(buf, s, va);
vsnprintf(buf, 1024, s, va);
va_end(va);
fprintf(stderr, "ERROR: %s!\n", buf);
@ -44,7 +44,7 @@ void warning(const char *s, ...) {
va_list va;
va_start(va, s);
vsprintf(buf, s, va);
vsnprintf(buf, 1024, s, va);
va_end(va);
fprintf(stderr, "WARNING: %s!\n", buf);