From 2459ca53ebebd52a429caa68e027eba2c3c0879d Mon Sep 17 00:00:00 2001 From: Jan Kratochvil Date: Wed, 31 Mar 2010 21:27:43 +0000 Subject: [PATCH] - Fix crash due to gdb-readline-6.0-signal.patch (BZ 575516) --- gdb-readline-6.0-signal.patch | 14 ++++++++++++-- gdb.spec | 7 +++++-- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/gdb-readline-6.0-signal.patch b/gdb-readline-6.0-signal.patch index 0873bea..fc1f294 100644 --- a/gdb-readline-6.0-signal.patch +++ b/gdb-readline-6.0-signal.patch @@ -127,7 +127,7 @@ gdb/testsuite/ /* Any events already waiting in the queue? */ if (process_event ()) -@@ -455,6 +459,16 @@ gdb_do_one_event (void *data) +@@ -455,6 +459,26 @@ gdb_do_one_event (void *data) if (gdb_wait_for_event (1) < 0) return -1; @@ -135,9 +135,19 @@ gdb/testsuite/ + if (async_command_editing_p && RL_ISSTATE (RL_STATE_CALLBACK) + && _rl_caught_signal) + { ++ char *saved; ++ ++ if (rl_prompt) ++ { ++ saved = alloca (strlen (rl_prompt) + 1); ++ strcpy (saved, rl_prompt); ++ } ++ else ++ saved = NULL; ++ + /* Call RL_CHECK_SIGNALS this way. */ + rl_callback_handler_remove (); -+ rl_callback_handler_install (NULL, input_handler); ++ rl_callback_handler_install (saved, input_handler); + } +#endif + diff --git a/gdb.spec b/gdb.spec index 0b4ecce..be11682 100644 --- a/gdb.spec +++ b/gdb.spec @@ -36,7 +36,7 @@ Version: 7.0.1 # The release always contains a leading reserved number, start it at 1. # `upstream' is not a part of `name' to stay fully rpm dependencies compatible for the testing. -Release: 36%{?_with_upstream:.upstream}%{dist} +Release: 37%{?_with_upstream:.upstream}%{dist} License: GPLv3+ Group: Development/Debuggers @@ -1085,7 +1085,10 @@ fi %endif %changelog -* Fri Mar 26 2010 Dennis Gilmore - 7.0.1-36.fc12 +* Wed Mar 31 2010 Jan Kratochvil - 7.0.1-37.fc12 +- Fix crash due to gdb-readline-6.0-signal.patch (BZ 575516) + +* Fri Mar 26 2010 Jan Kratochvil - 7.0.1-36.fc12 - Fix incorrect relocation of sections with duplicate name (BZ 575737). * Fri Mar 26 2010 Dennis Gilmore - 7.0.1-35.1