valter/dosbox-staging
1
0
Fork 0
Code Releases Activity

Fix bug #519

Browse source 
Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@4296
This commit is contained in:
Peter Veenstra 2019-11-26 16:52:04 +00:00
parent f1608a2509
commit 1521b7ad7d
3 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/debug/debug_gui.cpp
View file

@ -27,6 +27,7 @@
#include <curses.h>
#include <string.h>
#include "cross.h"
#include "support.h"
#include "regs.h"
#include "debug.h"
@ -56,16 +57,18 @@ void DEBUG_ShowMsg(char const* format,...) {
char buf[512];
va_list msg;
va_start(msg,format);
vsprintf(buf,format,msg);
vsnprintf(buf,sizeof(buf),format,msg);
va_end(msg);
buf[sizeof(buf) - 1] = '\0';
/* Add newline if not present */
Bitu len=strlen(buf);
if(buf[len-1]!='\n') strcat(buf,"\n");
size_t len = strlen(buf);
if(buf[len - 1] != '\n' && len + 1 < sizeof(buf) ) strcat(buf,"\n");
if(debuglog) fprintf(debuglog,"%s",buf);
if (logBuffPos!=logBuff.end()) {
if (logBuffPos != logBuff.end()) {
logBuffPos=logBuff.end();
DEBUG_RefreshPage(0);
// mvwprintw(dbg.win_out,dbg.win_out->_maxy-1, 0, "");

8
src/gui/sdlmain.cpp
View file

@ -1716,12 +1716,14 @@ static BOOL WINAPI ConsoleEventHandler(DWORD event) {
static bool no_stdout = false;
void GFX_ShowMsg(char const* format,...) {
char buf[512];
va_list msg;
va_start(msg,format);
vsprintf(buf,format,msg);
strcat(buf,"\n");
vsnprintf(buf,sizeof(buf),format,msg);
va_end(msg);
if(!no_stdout) printf("%s",buf); //Else buf is parsed again.
buf[sizeof(buf) - 1] = '\0';
if (!no_stdout) puts(buf); //Else buf is parsed again. (puts adds end of line)
}

7
src/misc/support.cpp
View file

@ -29,6 +29,7 @@
#include <string>
#include "dosbox.h"
#include "cross.h"
#include "debug.h"
#include "support.h"
#include "video.h"
@ -182,9 +183,11 @@ void E_Exit(const char * format,...) {
#endif
va_list msg;
va_start(msg,format);
vsprintf(buf,format,msg);
vsnprintf(buf,sizeof(buf),format,msg);
va_end(msg);
strcat(buf,"\n");
buf[sizeof(buf) - 1] = '\0';
//strcat(buf,"\n"); catcher should handle the end of line..
throw(buf);
}