rpms/libwpd/devel libwpd-0.8.5-wp5nofontlistcrash.patch, NONE, 1.1 libwpd.spec, 1.25, 1.26

[fedora-cvs-commits at redhat.com]

Author: caolanm

Update of /cvs/dist/rpms/libwpd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31245

Modified Files:
	libwpd.spec 
Added Files:
	libwpd-0.8.5-wp5nofontlistcrash.patch 
Log Message:
add wp5nofontlistcrash

libwpd-0.8.5-wp5nofontlistcrash.patch:
 WP5FontGroup.cpp |    3 ++-
 WP5Parser.cpp    |    1 -
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE libwpd-0.8.5-wp5nofontlistcrash.patch ---
--- src/lib/WP5Parser.cpp	27 May 2006 14:09:33 -0000	1.29
+++ src/lib/WP5Parser.cpp	10 Jun 2006 20:37:45 -0000	1.30
@@ -180,7 +180,6 @@
 		{
 			tmpFontSize = static_cast<const WP5ListFontsUsedPacket*>(listener.getGeneralPacketData(2))->getFontSize(0);
 			tmpFontNameOffset = static_cast<const WP5ListFontsUsedPacket*>(listener.getGeneralPacketData(2))->getFontNameOffset(0);
-			tmpFontName = static_cast<const WP5FontNameStringPoolPacket*>(listener.getGeneralPacketData(7))->getFontName(tmpFontNameOffset);
 		}
 		else
 			tmpHasFontsUsedPacket = false;
--- src/lib/WP5FontGroup.cpp	15 May 2006 12:39:49 -0000	1.2
+++ src/lib/WP5FontGroup.cpp	10 Jun 2006 20:37:45 -0000	1.3
@@ -97,7 +97,8 @@
 				return;
 			}
 
-			tmpFontName = static_cast<const WP5FontNameStringPoolPacket*>(listener->getGeneralPacketData(7))->getFontName(tmpFontNameOffset);
+			if (listener->getGeneralPacketData(7))
+				tmpFontName = static_cast<const WP5FontNameStringPoolPacket*>(listener->getGeneralPacketData(7))->getFontName(tmpFontNameOffset);
 			if (m_fontSize >= 0)
 				tmpFontSize = m_fontSize;
 


Index: libwpd.spec
===================================================================
RCS file: /cvs/dist/rpms/libwpd/devel/libwpd.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- libwpd.spec	2 Jun 2006 15:47:06 -0000	1.25
+++ libwpd.spec	11 Jun 2006 15:43:22 -0000	1.26
@@ -1,7 +1,7 @@
 Name: libwpd
 Summary: Library for reading and converting WordPerfect(tm) documents.
 Version: 0.8.5
-Release: 2
+Release: 3
 Source: %{name}-%{version}.tar.gz
 Group: System Environment/Libraries
 URL: http://libwpd.sf.net/
@@ -10,6 +10,8 @@
 Requires: glib2 >= 2.0.0, libgsf >= 1.6.0
 BuildRequires: glib2-devel >= 2.0.0, libgsf-devel >= 1.6.0
 
+Patch0: libwpd-0.8.5-wp5nofontlistcrash.patch
+
 %description
 Library that handles Word Perfect documents.
 
@@ -34,6 +36,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .wp5nofontlistcrash
 
 %build
 %configure --without-docs
@@ -66,6 +69,9 @@
 %{_includedir}/libwpd-0.8/libwpd
 
 %changelog
+* Sun Jun 11 2006  Caolan McNamara <caolanm at redhat.com> 0.8.5-3
+- add wp5nofontlistcrash
+
 * Fri Jun 02 2006  Caolan McNamara <caolanm at redhat.com> 0.8.5-2
 - build through brew