rpms/openoffice.org/F-11 workspace.calc311fixes.patch, NONE, 1.1 openoffice.org.spec, 1.1922, 1.1923

[David Tardon]

Author: dtardon

Update of /cvs/extras/rpms/openoffice.org/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18918

Modified Files:
	openoffice.org.spec 
Added Files:
	workspace.calc311fixes.patch 
Log Message:
Resolves: rhbz#510394 Crash while saving xls file possibly due to
double free or corruption error



workspace.calc311fixes.patch:

--- NEW FILE workspace.calc311fixes.patch ---
Index: sc/source/core/data/dpobject.cxx
===================================================================
--- sc/source/core/data/dpobject.cxx	(revision 271773)
+++ sc/source/core/data/dpobject.cxx	(revision 273857)
@@ -2345,7 +2345,7 @@
 	ScCollection(r),
     pDoc(r.pDoc),
     maSharedString(r.maSharedString),
-    maCacheCellPool(r.maCacheCellPool)
+    maCacheCellPool()   // #i101725# don't copy hash_set with pointers from the other collection
 {
 }
 
@@ -2507,8 +2507,9 @@
     vector<ScDPCacheCell*> ps;
     ps.reserve(maCacheCellPool.size());
     copy(maCacheCellPool.begin(), maCacheCellPool.end(), back_inserter(ps));
+    maCacheCellPool.clear();
+    // for correctness' sake, delete the elements after clearing the hash_set
     for_each(ps.begin(), ps.end(), DeleteCacheCells());
-    maCacheCellPool.clear();
 }
 
 //------------------------------------------------------------------------


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/extras/rpms/openoffice.org/F-11/openoffice.org.spec,v
retrieving revision 1.1922
retrieving revision 1.1923
diff -u -p -r1.1922 -r1.1923
--- openoffice.org.spec	2 Jul 2009 12:18:59 -0000	1.1922
+++ openoffice.org.spec	9 Jul 2009 11:55:46 -0000	1.1923
@@ -147,6 +147,7 @@ Patch71: openoffice.org-3.1.0.ooo102920.
 Patch72: workspace.aw073.patch
 Patch73: openoffice.org-3.1.1.ooo102932.sw.mailmerge.busted-integer-conversion.patch
 Patch74: openoffice.org-3.1.0.ooo103277.vcl.kwinworkaround.patch
+Patch75: workspace.calc311fixes.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1652,6 +1653,7 @@ cat %{PATCH11} >> svtools/source/dialogs
 %patch72 -p0 -b .workspace.aw073.patch
 %patch73 -p0 -b .ooo102932.sw.mailmerge.busted-integer-conversion.patch
 %patch74 -p0 -b .ooo103277.vcl.kwinworkaround.patch
+%patch75 -p0 -b .workspace.calc311fixes.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4156,6 +4158,8 @@ fi
 %changelog
 * Thu Jul 02 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.0-11.5.UNBUILT
 - Resolves: rhbz#506984 openoffice.org-3.1.0.ooo103277.vcl.kwinworkaround.patch
+- Resolves: rhbz#510394 Crash while saving xls file possibly due to
+  double free or corruption error
 
 * Fri Jun 22 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.0-11.4
 - Related: rhbz#472853 openoffice.org-3.1.0.ooo99250.sc.autooutline-reflists.patch