mirrors/Bochs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- SIM->debug_get_next_command () can return null. Now when it does,

Browse Source 
we avoid the segfault!  The NULL in charptr_ret will cause the
  debugger read loop to quit.
This commit is contained in:
Bryce Denney 2002-10-17 15:48:55 +00:00
parent 4da94436b0
commit d87480bb03
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
bochs/debug/dbg_main.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: dbg_main.cc,v 1.78 2002-10-16 22:20:32 bdenney Exp $
// $Id: dbg_main.cc,v 1.79 2002-10-17 15:48:55 bdenney Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2001 MandrakeSoft S.A.
@ -508,11 +508,17 @@ bx_get_command(void)
if (bx_infile_stack_index == 0) {
// wait for wxWindows to send another debugger command
charptr_ret = SIM->debug_get_next_command ();
strncpy (tmp_buf, charptr_ret, sizeof(tmp_buf));
strcat (tmp_buf, "\n");
// the returned string was allocated in wxmain.cc by "new char[]". free it.
delete [] charptr_ret;
charptr_ret = &tmp_buf[0];
if (charptr_ret) {
strncpy (tmp_buf, charptr_ret, sizeof(tmp_buf));
strcat (tmp_buf, "\n");
// The returned string was allocated in wxmain.cc by "new char[]".
// Free it with delete[].
delete [] charptr_ret;
charptr_ret = &tmp_buf[0];
} else {
// if debug_get_next_command returned NULL, probably the GUI is
// shutting down
}
}
#elif HAVE_LIBREADLINE
if (bx_infile_stack_index == 0) {
@ -545,6 +551,7 @@ bx_get_command(void)
else {
// not nested, sitting at stdin prompt, user wants out
bx_dbg_quit_command();
BX_PANIC (("bx_dbg_quit_command should not return, but it did"));
}
// call recursively