ooo-build r12543 - in branches/ooo-build-2-4-1: . patches/src680
- From: rodo svn gnome org
- To: svn-commits-list gnome org
- Subject: ooo-build r12543 - in branches/ooo-build-2-4-1: . patches/src680
- Date: Wed, 14 May 2008 12:39:46 +0100 (BST)
Author: rodo
Date: Wed May 14 11:39:46 2008
New Revision: 12543
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12543&view=rev
Log:
2008-05-14 Radek Doulik <rodo novell com>
* store/source/stordata.hxx: fix two == operators where NULL might
get dereferenced
* patches/dev300/store-core.diff: updated with changes above
Modified:
branches/ooo-build-2-4-1/ChangeLog
branches/ooo-build-2-4-1/patches/src680/store-core.diff
Modified: branches/ooo-build-2-4-1/patches/src680/store-core.diff
==============================================================================
--- branches/ooo-build-2-4-1/patches/src680/store-core.diff (original)
+++ branches/ooo-build-2-4-1/patches/src680/store-core.diff Wed May 14 11:39:46 2008
@@ -2272,7 +2272,7 @@
/** Construction.
*/
-@@ -419,15 +499,232 @@ struct OStoreDirectoryDataBlock
+@@ -419,15 +499,235 @@ struct OStoreDirectoryDataBlock
void swap (void);
};
@@ -2337,7 +2337,10 @@
+ sal_Bool operator== (const OStoreDirectoryDataBlockV1& rOther) const
+ {
+ if (m_pRepresentation == NULL && rOther.m_pRepresentation == NULL)
-+ sal_True;
++ return sal_True;
++
++ if (m_pRepresentation == NULL || rOther.m_pRepresentation == NULL)
++ return sal_False;
+
+ return (m_pRepresentation->m_aGuard == rOther.m_pRepresentation->m_aGuard);
+ }
@@ -2510,7 +2513,7 @@
{
return sal_uInt16(sizeof(G) + sizeof(LinkTable) + sizeof(sal_uInt32));
}
-@@ -436,22 +733,50 @@ struct OStoreDirectoryDataBlock
+@@ -436,22 +733,53 @@ struct OStoreDirectoryDataBlock
*/
void initialize (void)
{
@@ -2563,7 +2566,10 @@
{
- return (m_aGuard == rOther.m_aGuard);
+ if (m_pRepresentation == NULL && rOther.m_pRepresentation == NULL)
-+ sal_True;
++ return sal_True;
++
++ if (m_pRepresentation == NULL || rOther.m_pRepresentation == NULL)
++ return sal_False;
+
+ return (m_pRepresentation->m_aGuard == rOther.m_pRepresentation->m_aGuard);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]