From e027afdda587c030fecb0c713ff253122d660602 Mon Sep 17 00:00:00 2001
From: Jan Kratochvil <jkratoch@fedoraproject.org>
Date: Nov 10 2009 22:11:05 +0000
Subject: - Fix crash on some catch commands (BZ 533525).


---

diff --git a/gdb-bz533525-catch-crash.patch b/gdb-bz533525-catch-crash.patch
new file mode 100644
index 0000000..fdea44c
--- /dev/null
+++ b/gdb-bz533525-catch-crash.patch
@@ -0,0 +1,36 @@
+http://sourceware.org/ml/gdb-cvs/2009-04/msg00204.html
+http://sourceware.org/ml/gdb-cvs/2009-04/msg00204.html
+d0194c6e1be20c223824e1b1648b4ff0543b1335
+
+### src/gdb/ChangeLog	2009/04/29 07:51:32	1.10423
+### src/gdb/ChangeLog	2009/04/29 19:31:55	1.10424
+## -1,3 +1,9 @@
++2009-04-29  Pedro Alves  <pedro@codesourcery.com>
++
++	* breakpoint.c (print_exception_catchpoint): Access `b' directly
++	instead of `b->loc->owner'.
++	(print_mention_exception_catchpoint): Ditto.
++
+ 2009-04-29  Jan Kratochvil  <jan.kratochvil@redhat.com>
+ 
+ 	* macrocmd.c (info_macro_command): Print -Dname=value if LINE is zero.
+--- src/gdb/breakpoint.c	2009/04/23 22:38:24	1.391
++++ src/gdb/breakpoint.c	2009/04/29 19:31:58	1.392
+@@ -6631,7 +6631,7 @@
+     breakpoint_adjustment_warning (b->loc->requested_address,
+ 	                           b->loc->address,
+ 				   b->number, 1);
+-  bp_temp = b->loc->owner->disposition == disp_del;
++  bp_temp = b->disposition == disp_del;
+   ui_out_text (uiout, 
+ 	       bp_temp ? "Temporary catchpoint "
+ 		       : "Catchpoint ");
+@@ -6678,7 +6678,7 @@
+   int bp_temp;
+   int bp_throw;
+ 
+-  bp_temp = b->loc->owner->disposition == disp_del;
++  bp_temp = b->disposition == disp_del;
+   bp_throw = strstr (b->addr_string, "throw") != NULL;
+   ui_out_text (uiout, bp_temp ? _("Temporary catchpoint ")
+ 			      : _("Catchpoint "));
diff --git a/gdb.spec b/gdb.spec
index 3929554..0acd788 100644
--- a/gdb.spec
+++ b/gdb.spec
@@ -13,7 +13,7 @@ Version: 6.8.50.20090302
 
 # 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: 38%{?_with_upstream:.upstream}%{?dist}
+Release: 39%{?_with_upstream:.upstream}%{?dist}
 
 License: GPLv3+
 Group: Development/Debuggers
@@ -397,6 +397,9 @@ Patch377: gdb-delayed-symfile-aranges.patch
 # Remove wrong assertion on types objfile (BZ 508406).
 Patch379: gdb-bz508406-vla-type-objfile.patch
 
+# Fix crash on some catch commands (BZ 533525).
+Patch386: gdb-bz533525-catch-crash.patch
+
 BuildRequires: ncurses-devel texinfo gettext flex bison expat-devel
 Requires: readline
 BuildRequires: readline-devel
@@ -599,6 +602,7 @@ rm -f gdb/jv-exp.c gdb/m2-exp.c gdb/objc-exp.c gdb/p-exp.c
 %patch376 -p1
 %patch377 -p1
 %patch379 -p1
+%patch386 -p1
 %patch124 -p1
 
 find -name "*.orig" | xargs rm -f
@@ -879,6 +883,9 @@ fi
 %endif
 
 %changelog
+* Tue Nov 10 2009 Jan Kratochvil <jan.kratochvil@redhat.com> - 6.8.50.20090302-39
+- Fix crash on some catch commands (BZ 533525).
+
 * Thu Aug 27 2009 Jan Kratochvil <jan.kratochvil@redhat.com> - 6.8.50.20090302-38
 - Remove wrong assertion on types objfile (BZ 508406).