rpms/beagle/F-7 beagle-empty-ooo-file.patch, NONE, 1.1 beagle.spec, 1.98, 1.99

[Alexander Larsson (alexl)]

Author: alexl

Update of /cvs/pkgs/rpms/beagle/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14303

Modified Files:
	beagle.spec 
Added Files:
	beagle-empty-ooo-file.patch 
Log Message:
* Mon May 21 2007 Alexander Larsson <alexl at redhat.com> - 0.2.16.2-5
- Fix hang on empty OOo files (#217031)


beagle-empty-ooo-file.patch:

--- NEW FILE beagle-empty-ooo-file.patch ---
Index: Filters/FilterOpenOffice.cs
===================================================================
--- Filters/FilterOpenOffice.cs	(revision 3611)
+++ Filters/FilterOpenOffice.cs	(working copy)
@@ -427,9 +427,8 @@
 
 		private void ExtractMetadata (XmlReader reader)
 		{
-			do {
-				reader.Read ();
-			} while (reader.Depth < 2);
+			while (reader.Read () && reader.Depth < 2)
+				;
 
 			while (reader.Depth >= 2) {
 				if (reader.Depth != 2 || reader.NodeType != XmlNodeType.Element) {


Index: beagle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/beagle/F-7/beagle.spec,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- beagle.spec	29 Mar 2007 13:39:12 -0000	1.98
+++ beagle.spec	21 May 2007 08:53:54 -0000	1.99
@@ -1,6 +1,6 @@
 Name:           beagle
 Version:        0.2.16.2
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        The Beagle Search Infrastructure
 Group:          User Interface/Desktops
 License:        LGPL
@@ -44,6 +44,7 @@
 Patch5: beagle-0.2.15.1-runuser.patch
 Patch6: beagle-0.2.15.1-libdir.patch
 Patch8: beagle-0.2.10-xconnection-exit-2.patch
+Patch9: beagle-empty-ooo-file.patch
 
 # Mono only available on these:
 ExclusiveArch: %ix86 x86_64 ppc ia64 armv4l sparc alpha
@@ -112,6 +113,7 @@
 %patch5 -p1 -b .runuser
 %patch6 -p1 -b .libdir
 %patch8 -p1 -b .xconnection-exit
+%patch9 -p0 -b .empty-ooo-file
 
 %build
 autoconf
@@ -332,6 +334,9 @@
 %{_libdir}/python*/site-packages/beagle.so
 
 %changelog
+* Mon May 21 2007 Alexander Larsson <alexl at redhat.com> - 0.2.16.2-5
+- Fix hang on empty OOo files (#217031)
+
 * Thu Mar 29 2007 Alexander Larsson <alexl at redhat.com> - 0.2.16.2-4
 - Also build on alpha (#232265)