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

Merge branch 'svn/trunk' r4296

Browse source
This commit is contained in:
Patryk Obara 2019-11-26 18:36:56 +01:00
commit 301d7c3423
4 changed files with 21 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/debug/debug.cpp
View file

@ -2288,8 +2288,10 @@ bool CDebugVar::LoadVars(char* name)
// read number of vars
Bit16u num;
if (fread(&num,sizeof(num),1,f) != 1) return false;
if (fread(&num,sizeof(num),1,f) != 1) {
fclose(f);
return false;
}
for (Bit16u i=0; i<num; i++) {
char name[16];
// name

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

@ -28,6 +28,7 @@
#include <cstring>
#include "dosbox.h"
#include "cross.h"
#include "debug.h"
#include "support.h"
#include "video.h"
@ -181,9 +182,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);
}