[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[darin]

The following commit has been merged in the debian/unstable branch:
commit 4b077ae1f354d3b5b0b6bccc157f55c9a096bf06
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 30 06:32:52 2003 +0000

            - add new assertion that Dave can use to debug bug 3155954 tomorrow
    
            * khtml/rendering/render_arena.cpp: (RenderArena::allocate): Assert that the arena is not 0.
            (RenderArena::free): Change signature so we will detect double-frees even more simply.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3504 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 71778e6..3b2efdf 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,10 @@
+2003-01-29  Darin Adler  <darin at apple.com>
+
+        - add new assertion that Dave can use to debug bug 3155954 tomorrow
+
+        * khtml/rendering/render_arena.cpp: (RenderArena::allocate): Assert that the arena is not 0.
+        (RenderArena::free): Change signature so we will detect double-frees even more simply.
+
 2003-01-29  David Hyatt  <hyatt at apple.com>
 
 	Margins were being lost on documents inside iframes
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 71778e6..3b2efdf 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,10 @@
+2003-01-29  Darin Adler  <darin at apple.com>
+
+        - add new assertion that Dave can use to debug bug 3155954 tomorrow
+
+        * khtml/rendering/render_arena.cpp: (RenderArena::allocate): Assert that the arena is not 0.
+        (RenderArena::free): Change signature so we will detect double-frees even more simply.
+
 2003-01-29  David Hyatt  <hyatt at apple.com>
 
 	Margins were being lost on documents inside iframes
diff --git a/WebCore/khtml/rendering/render_arena.cpp b/WebCore/khtml/rendering/render_arena.cpp
index 1890024..d9cc9e5 100644
--- a/WebCore/khtml/rendering/render_arena.cpp
+++ b/WebCore/khtml/rendering/render_arena.cpp
@@ -37,6 +37,7 @@
 #ifndef NDEBUG
 
 const int signature = 0xDBA00AEA;
+const int signatureDead = 0xDBA00AED;
 
 typedef struct {
     RenderArena *arena;
@@ -65,6 +66,7 @@ void* RenderArena::allocate(size_t size)
 {
 #ifndef NDEBUG
     // Use standard malloc so that memory debugging tools work.
+    assert(this);
     void *block = ::malloc(sizeof(RenderArenaDebugHeader) + size);
     RenderArenaDebugHeader *header = (RenderArenaDebugHeader *)block;
     header->arena = this;
@@ -106,6 +108,7 @@ void RenderArena::free(size_t size, void* ptr)
     assert(header->signature == signature);
     assert(header->size == size);
     assert(header->arena == this);
+    header->signature = signatureDead;
     ::free(header);
 #else
     // Ensure we have correct alignment for pointers.  Important for Tru64

-- 
WebKit Debian packaging