rpms/libbonoboui/F-12 accelerator-loop.patch, NONE, 1.1 libbonoboui.spec, 1.71, 1.72

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/libbonoboui/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3214

Modified Files:
	libbonoboui.spec 
Added Files:
	accelerator-loop.patch 
Log Message:
fix a possible infinite loop


accelerator-loop.patch:
 bonobo-ui-util.c |    4 ++++
 1 file changed, 4 insertions(+)

--- NEW FILE accelerator-loop.patch ---
diff --git a/bonobo/bonobo-ui-util.c b/bonobo/bonobo-ui-util.c
index 99b56a4..bba0f02 100644
--- a/bonobo/bonobo-ui-util.c
+++ b/bonobo/bonobo-ui-util.c
@@ -1251,6 +1251,10 @@ bonobo_ui_util_accel_parse (const char        *accelerator,
 				gchar last_ch;
 	      
 				last_ch = *accelerator;
+				if (!last_ch || last_ch == DELIM_POST) {
+					g_warning ("Unknown accelerator - '%s'", accelerator);
+					return;
+				}
 				while (last_ch && last_ch != DELIM_POST)
 				{
 					last_ch = *accelerator;



Index: libbonoboui.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libbonoboui/F-12/libbonoboui.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -p -r1.71 -r1.72
--- libbonoboui.spec	24 Sep 2009 01:43:18 -0000	1.71
+++ libbonoboui.spec	17 Oct 2009 19:06:56 -0000	1.72
@@ -14,7 +14,7 @@
 Summary: Bonobo user interface components
 Name: libbonoboui
 Version: 2.24.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/libbonoboui/2.24/%{name}-%{version}.tar.bz2
 License: GPLv2+ and LGPLv2+
@@ -39,6 +39,9 @@ BuildRequires: glib2-devel >= %{glib2_ve
 BuildRequires: libXt-devel
 BuildRequires: gettext
 
+# from upstream
+Patch0: accelerator-loop.patch
+
 %description
 
 Bonobo is a component system based on CORBA, used by the GNOME
@@ -71,6 +74,7 @@ use libbonoboui.
 
 %prep
 %setup -q -n %{name}-%{version}
+%patch0 -p1 -b .accelerator-loop
 
 %build
 
@@ -118,6 +122,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gtk-doc/html/libbonoboui
 
 %changelog
+* Sat Oct 17 2009 Matthias Clasen <mclasen at redhat.com> - 2.24.2-2
+- Fix a possible infinite loop
+
 * Wed Sep 23 2009 Matthias Clasen <mclasen at redhat.com> - 2.24.2-1
 - Update to 2.24.2