[Libreoffice-commits] .: patches/dev300

[Caolán McNamara]

 patches/dev300/apply               |    3 ---
 patches/dev300/sal-doublefree.diff |   31 -------------------------------
 2 files changed, 34 deletions(-)

New commits:
commit 113fa7e01d9170a218f60812538c4d0cdf431bc0
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Mar 29 14:14:29 2011 +0100

    ditch this

diff --git a/patches/dev300/apply b/patches/dev300/apply
index d07b42e..bb45546 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -238,9 +238,6 @@ buildfix-qadevOOo-java-encoding.diff, brosenk
 # 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
-
 # Tell the desktop we support the VFS
 uses-vfs.diff, i#43504, michael
 
diff --git a/patches/dev300/sal-doublefree.diff b/patches/dev300/sal-doublefree.diff
deleted file mode 100644
index af0c9a5..0000000
--- a/patches/dev300/sal-doublefree.diff
+++ /dev/null
@@ -1,31 +0,0 @@
----
- sal/rtl/source/alloc_cache.c |   13 +++++++++++++
- 1 files changed, 13 insertions(+), 0 deletions(-)
-
-diff --git sal/rtl/source/alloc_cache.c sal/rtl/source/alloc_cache.c
-index 51de21f..f7796f8 100644
---- sal/rtl/source/alloc_cache.c
-+++ sal/rtl/source/alloc_cache.c
-@@ -1268,6 +1268,19 @@ SAL_CALL rtl_cache_free (
-             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)
-+                {
-+                    OSL_ENSURE(curr->m_objects[i] != obj, "DOUBLE FREE!");
-+                    if (curr->m_objects[i] == obj)
-+                    {
-+                        RTL_MEMORY_LOCK_RELEASE(&(cache->m_depot_lock));
-+                        return;
-+                    }
-+
-+                }
-+#endif
-                 curr->m_objects[curr->m_mag_used++] = obj;
-                 cache->m_cpu_stats.m_free += 1;
-                 RTL_MEMORY_LOCK_RELEASE(&(cache->m_depot_lock));
--- 
-1.7.0.1
-