From e6352148e801d11b5b1ea07c50f6ce9341a3ea53 Mon Sep 17 00:00:00 2001
From: Johannes Sixt <johannes.sixt@telecom.at>
Date: Tue, 25 Oct 2005 19:33:35 +0000
Subject: [PATCH] Work-around for gdb 6.3 crash at info line main by Stefan T.

---
 ChangeLog          | 3 +++
 kdbg/gdbdriver.cpp | 9 ++++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 7742a40..5f6225a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,9 @@ Version 2.0.1
 
 	Updated Hungarian translation (thanks to Tamas Szanto).
 
+	Worked around gdb 6.3 crashes at "info line main" command (thanks to
+	Stefan Taferner).
+
 Version 2.0.0
 
 	References and const types are treated like the base type (thanks to
diff --git a/kdbg/gdbdriver.cpp b/kdbg/gdbdriver.cpp
index d185d26..0c1d417 100644
--- a/kdbg/gdbdriver.cpp
+++ b/kdbg/gdbdriver.cpp
@@ -72,7 +72,7 @@ static GdbCmdInfo cmds[] = {
     { DCtargetremote, "target remote %s\n", GdbCmdInfo::argString },
     { DCcorefile, "core-file %s\n", GdbCmdInfo::argString },
     { DCattach, "attach %s\n", GdbCmdInfo::argString },
-    { DCinfolinemain, "info line main\n", GdbCmdInfo::argNone },
+    { DCinfolinemain, "kdbg_infolinemain\n", GdbCmdInfo::argNone },
     { DCinfolocals, "kdbg__alllocals\n", GdbCmdInfo::argNone },
     { DCinforegisters, "info all-registers\n", GdbCmdInfo::argNone},
     { DCexamine, "x %s %s\n", GdbCmdInfo::argString2 },
@@ -243,6 +243,13 @@ bool GdbDriver::startup(QString cmdStr)
 	"info locals\n"			/* local vars supersede args with same name */
 	"info args\n"			/* therefore, arguments must come last */
 	"end\n"
+	/*
+	 * Work around a bug in gdb-6.3: "info line main" crashes gdb.
+	 */
+	"define kdbg_infolinemain\n"
+	"list\n"
+	"info line\n"
+	"end\n"
 	// change prompt string and synchronize with gdb
 	"set prompt " PROMPT "\n"
 	;
-- 
2.11.4.GIT