[Libwpd-cvs] libwpd2/src/lib WP6ContentListener.cpp, 1.70, 1.71 WP6GraphicsCachedFileDataPacket.cpp, 1.8, 1.9

[Fridrich S. <str...@us...>]

Update of /cvsroot/libwpd/libwpd2/src/lib
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv14142/src/lib

Modified Files:
	WP6ContentListener.cpp WP6GraphicsCachedFileDataPacket.cpp 
Log Message:
Prevent a null pointer crash when graphics data points to emty object

Index: WP6GraphicsCachedFileDataPacket.cpp
===================================================================
RCS file: /cvsroot/libwpd/libwpd2/src/lib/WP6GraphicsCachedFileDataPacket.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- WP6GraphicsCachedFileDataPacket.cpp	18 Jul 2008 13:03:02 -0000	1.8
+++ WP6GraphicsCachedFileDataPacket.cpp	3 May 2010 08:23:17 -0000	1.9
@@ -46,6 +46,7 @@
 	m_data = 0;
 	if (m_object)
 		delete m_object;
+	m_object = 0;
 }
 
 void WP6GraphicsCachedFileDataPacket::_readContents(WPXInputStream *input, WPXEncryption *encryption)

Index: WP6ContentListener.cpp
===================================================================
RCS file: /cvsroot/libwpd/libwpd2/src/lib/WP6ContentListener.cpp,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -d -r1.70 -r1.71
--- WP6ContentListener.cpp	3 Dec 2008 13:40:34 -0000	1.70
+++ WP6ContentListener.cpp	3 May 2010 08:23:17 -0000	1.71
@@ -1647,7 +1647,8 @@
 	{
 		WPXPropertyList propList;
 		propList.insert("libwpd:mimetype", "image/x-wpg");
-		m_documentInterface->insertBinaryObject(propList, *(gcfdPacket->getBinaryObject()));
+		if (gcfdPacket->getBinaryObject())
+			m_documentInterface->insertBinaryObject(propList, *(gcfdPacket->getBinaryObject()));
 	}
 }