[ooo-build-commit] patches/dev300

[Thorsten Behrens]

 patches/dev300/apply               |    6 +++---
 patches/dev300/sal-doublefree.diff |    4 +++-
 2 files changed, 6 insertions(+), 4 deletions(-)

New commits:
commit f0feeab087e789b79065b4a7981171eef8630e4b
Author: Thorsten Behrens <tbehrens at novell.com>
Date:   Thu Nov 12 20:48:08 2009 +0100

    Temp hack moved to debug code instead
    
    * patches/dev300/apply: moved patch to more appropriate section
    * patches/dev300/sal-doublefree.diff: check for double free only
      enabled in non-pro builds. can be quite costly otherwise.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 893a644..7be3970 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -238,9 +238,6 @@ linkoo-type.diff
 #for selection delete crash
 selection-crash-svx-svdmrkv.diff, i#76084, jianhua
 
-# workaround for a crash in the help on amd64.
-sal-doublefree.diff, i#67740, mklose
-
 # hack for n#240776
 sw-graphic-save-problem.diff, flr, n#240776
 
@@ -353,6 +350,9 @@ debug-bits.diff, i#35336, jholesov
 # Make the scroll-wheel / page popup more sane
 gui-sw-scroll.diff, i#20826, michael
 
+# warnings for double-frees in alloc_cache (non-pro only)
+sal-doublefree.diff, i#67740, cmc
+
 # make menu layout prettier
 vcl-menu-fixes.diff, i#67123, n#523852, michael/jholesov
 
diff --git a/patches/dev300/sal-doublefree.diff b/patches/dev300/sal-doublefree.diff
index 61c7aca..f1f8b2b 100644
--- a/patches/dev300/sal-doublefree.diff
+++ b/patches/dev300/sal-doublefree.diff
@@ -5,10 +5,11 @@ retrieving revision 1.2
 diff -u -r1.2 alloc_cache.c
 --- sal/rtl/source/alloc_cache.c	2 May 2006 12:11:54 -0000	1.2
 +++ sal/rtl/source/alloc_cache.c	25 Jul 2006 07:57:10 -0000
-@@ -1274,6 +1282,17 @@
+@@ -1274,6 +1282,19 @@
  			curr = cache->m_cpu_curr;
  			if ((curr != 0) && (curr->m_mag_used < curr->m_mag_size))
  			{
++#if OSL_DEBUG_LEVEL != 0
 +				int i;
 +				for (i = 0; i < curr->m_mag_used; ++i)
 +				{
@@ -20,6 +21,7 @@ diff -u -r1.2 alloc_cache.c
 +					}
 +
 +				}
++#endif
  				curr->m_objects[curr->m_mag_used++] = obj;
  				cache->m_cpu_stats.m_free += 1;
  				RTL_MEMORY_LOCK_RELEASE(&(cache->m_depot_lock));