rpms/gdb/F-13 gdb-bz611569-gdbpy_is_string.patch, NONE, 1.1 gdb.spec, 1.447, 1.448

[Jan Kratochvil]

Author: jkratoch

Update of /cvs/pkgs/rpms/gdb/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv6831

Modified Files:
	gdb.spec 
Added Files:
	gdb-bz611569-gdbpy_is_string.patch 
Log Message:
* Thu Jul 22 2010 Jan Kratochvil <jan.kratochvil at redhat.com> - 7.1-30.fc13
- Fix crash in gdbpy_is_string (BZ 611569, Tom Tromey).


gdb-bz611569-gdbpy_is_string.patch:
 py-prettyprint.c |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

--- NEW FILE gdb-bz611569-gdbpy_is_string.patch ---
FYI: fix buglet in gdbpy_get_display_hint
http://sourceware.org/ml/gdb-patches/2010-07/msg00190.html
http://sourceware.org/ml/gdb-cvs/2010-07/msg00061.html

### src/gdb/ChangeLog	2010/07/09 02:39:57	1.11979
### src/gdb/ChangeLog	2010/07/09 20:29:56	1.11980
## -1,3 +1,8 @@
+2010-07-09  Tom Tromey  <tromey at redhat.com>
+
+	* python/py-prettyprint.c (gdbpy_get_display_hint): Don't use
+	'hint' if it is NULL.
+
 2010-07-09  Hui Zhu  <teawater at gmail.com>
 
 	* source.c (print_source_lines_base): Add check for noprint.
--- src/gdb/python/py-prettyprint.c	2010/06/11 15:36:09	1.12
+++ src/gdb/python/py-prettyprint.c	2010/07/09 20:29:56	1.13
@@ -229,10 +229,12 @@
     return NULL;
 
   hint = PyObject_CallMethodObjArgs (printer, gdbpy_display_hint_cst, NULL);
-  if (gdbpy_is_string (hint))
-    result = python_string_to_host_string (hint);
   if (hint)
-    Py_DECREF (hint);
+    {
+      if (gdbpy_is_string (hint))
+	result = python_string_to_host_string (hint);
+      Py_DECREF (hint);
+    }
   else
     gdbpy_print_stack ();
 


Index: gdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/F-13/gdb.spec,v
retrieving revision 1.447
retrieving revision 1.448
diff -u -p -r1.447 -r1.448
--- gdb.spec	20 Jul 2010 17:21:23 -0000	1.447
+++ gdb.spec	22 Jul 2010 15:14:44 -0000	1.448
@@ -36,7 +36,7 @@ Version: 7.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: 29%{?_with_upstream:.upstream}%{dist}
+Release: 30%{?_with_upstream:.upstream}%{dist}
 
 License: GPLv3+ and GPLv3+ with exceptions and GPLv2+ and GPLv2+ with exceptions and GPL+ and LGPLv2+ and GFDL and BSD and Public Domain
 Group: Development/Debuggers
@@ -533,6 +533,9 @@ Patch489: gdb-bz614659-prelink-dynbss.pa
 # [delayed-symfile] Fix a backtrace regression on CFIs without DIE (BZ 614604).
 Patch490: gdb-bz614604-bt-cfi-without-die.patch
 
+# Fix crash in gdbpy_is_string (BZ 611569, Tom Tromey).
+Patch492: gdb-bz611569-gdbpy_is_string.patch
+
 BuildRequires: ncurses-devel%{?_isa} texinfo gettext flex bison expat-devel%{?_isa}
 Requires: readline%{?_isa}
 BuildRequires: readline-devel%{?_isa}
@@ -837,6 +840,7 @@ rm -f gdb/jv-exp.c gdb/m2-exp.c gdb/objc
 %patch487 -p1
 %patch489 -p1
 %patch490 -p1
+%patch492 -p1
 
 %patch415 -p1
 %patch393 -p1
@@ -1169,6 +1173,9 @@ fi
 %endif
 
 %changelog
+* Thu Jul 22 2010 Jan Kratochvil <jan.kratochvil at redhat.com> - 7.1-30.fc13
+- Fix crash in gdbpy_is_string (BZ 611569, Tom Tromey).
+
 * Tue Jul 20 2010 Jan Kratochvil <jan.kratochvil at redhat.com> - 7.1-29.fc13
 - Fix prelinked executables with sepdebug and copy relocations (BZ 614659).
 - [delayed-symfile] Fix a backtrace regression on CFIs without DIE (BZ 614604).