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

HUGO: Fix invalid usage of snprintf with va_args

Browse source 
svn-id: r52390
This commit is contained in:
Andre Heider 2010-08-25 17:03:24 +00:00
parent 05c2cc4d1d
commit 088da9e698
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
engines/hugo/util.cpp
View file

@ -122,12 +122,12 @@ void Utils::Warn(bool technote, const char *format, ...) {
va_start(marker, format); va_start(marker, format);
vsnprintf(buffer, WARNLEN, format, marker); vsnprintf(buffer, WARNLEN, format, marker);
va_end(marker);
//// if (technote) //// if (technote)
//// strcat (buffer, sTech); //// strcat (buffer, sTech);
//MessageBeep(MB_ICONEXCLAMATION); //MessageBeep(MB_ICONEXCLAMATION);
//MessageBox(hwnd, buffer, "HugoWin Warning", MB_OK | MB_ICONEXCLAMATION); //MessageBox(hwnd, buffer, "HugoWin Warning", MB_OK | MB_ICONEXCLAMATION);
warning("Hugo warning: %s", buffer); warning("Hugo warning: %s", buffer);
va_end(marker);
//sndPlaySound(NULL, 0); // Stop beep and restore sound //sndPlaySound(NULL, 0); // Stop beep and restore sound
@ -175,11 +175,11 @@ void Utils::Error(int error_type, const char *format, ...) {
HugoEngine::get().shutdown(); // Restore any devices before exit HugoEngine::get().shutdown(); // Restore any devices before exit
va_start(marker, format); va_start(marker, format);
snprintf(&buffer[strlen(buffer)], ERRLEN - strlen(buffer), format, marker); vsnprintf(&buffer[strlen(buffer)], ERRLEN - strlen(buffer), format, marker);
va_end(marker);
//MessageBeep(MB_ICONEXCLAMATION); //MessageBeep(MB_ICONEXCLAMATION);
//MessageBox(hwnd, buffer, "HugoWin Error", MB_OK | MB_ICONEXCLAMATION); //MessageBox(hwnd, buffer, "HugoWin Error", MB_OK | MB_ICONEXCLAMATION);
warning("Hugo Error: %s", buffer); warning("Hugo Error: %s", buffer);
va_end(marker);
if (fatal) if (fatal)
exit(1); exit(1);