* gdbtk.c (gdbtk_init): Prevent segfault when gdbtk.tcl can't be

	found.
	* gdbtk.tcl:  Initialize expr_update_list() to prevent errors when
	popping up expression window for the first time.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 3cc3a3436b66edb2a8e5cca496490801b68dab71..9dac0e49de79b4b9ebe93178c9778c94bfda6fd7 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+Wed Jan 25 18:23:46 1995  Stu Grossman  (grossman@cygnus.com)
+
+       * gdbtk.c (gdbtk_init):  Prevent segfault when gdbtk.tcl can't be
+       found.
+       * gdbtk.tcl:  Initialize expr_update_list() to prevent errors when
+       popping up expression window for the first time.
+
 Wed Jan 25 18:13:14 1995  Per Bothner  <bothner@kalessin.cygnus.com>
 
        * eval.c (evaluate_subexp case OP_ARRAY):  Fix calls to memset:

diff --git a/gdb/gdbtk.c b/gdb/gdbtk.c
index ca7ef40913d208cc1c0f68a1eb55bacb70520a07..35b2a91f7ffde4efc6a44ba275691d9e216b3417 100644 (file)
--- a/gdb/gdbtk.c
+++ b/gdb/gdbtk.c
@@ -1184,11 +1184,16 @@ gdbtk_init ()
 
   if (Tcl_EvalFile (interp, gdbtk_filename) != TCL_OK)
     {
+      char *err;
+
       fputs_unfiltered_hook = NULL; /* Force errors to stdout/stderr */
 
       fprintf_unfiltered (stderr, "%s:%d: %s\n", gdbtk_filename,
                          interp->errorLine, interp->result);
-      error ("Stack trace:\n%s", Tcl_GetVar (interp, "errorInfo", 0));
+
+      fputs_unfiltered ("Stack trace:\n", gdb_stderr);
+      fputs_unfiltered (Tcl_GetVar (interp, "errorInfo", 0), gdb_stderr);
+      error ("");
     }
 
   discard_cleanups (old_chain);

diff --git a/gdb/gdbtk.tcl b/gdb/gdbtk.tcl
index f44dc741fd5f2f0f56f5b59b8e3c5f7bb999f76d..2df9cf08ddda39a908d6db6d9ca76efca7b2a177 100644 (file)
--- a/gdb/gdbtk.tcl
+++ b/gdb/gdbtk.tcl
@@ -31,6 +31,7 @@ set cfunc NIL
 set line_numbers 1
 set breakpoint_file(-1) {[garbage]}
 set disassemble_with_source nosource
+set expr_update_list(0) 0
 
 #option add *Foreground Black
 #option add *Background White