[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[zoltan at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit fadf502d4b6bf40b6629f37f1b2dbcef51ae5d43
Author: zoltan at webkit.org <zoltan at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 7 10:19:38 2010 +0000

    2010-01-07  Zoltan Horvath  <zoltan at webkit.org>
    
            Reviewed by Holger Freyther.
    
            [Qt] Build fix when FAST_MALLOC_MATCH_VALIDATION=1
            https://bugs.webkit.org/show_bug.cgi?id=33312
    
            Remove pByte (committed in r42344 from #20422), because pByte doesn't
            exist and it is unnecessary.
    
            * wtf/FastMalloc.cpp:
            (WTF::TCMallocStats::realloc):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52911 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 017c0da..660aa13 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-01-07  Zoltan Horvath  <zoltan at webkit.org>
+
+        Reviewed by Holger Freyther.
+
+        [Qt] Build fix when FAST_MALLOC_MATCH_VALIDATION=1
+        https://bugs.webkit.org/show_bug.cgi?id=33312
+
+        Remove pByte (committed in r42344 from #20422), because pByte doesn't
+        exist and it is unnecessary.
+
+        * wtf/FastMalloc.cpp:
+        (WTF::TCMallocStats::realloc):
+
 2010-01-06  Gavin Barraclough  <barraclough at apple.com>
 
         QT build fix.
diff --git a/JavaScriptCore/wtf/FastMalloc.cpp b/JavaScriptCore/wtf/FastMalloc.cpp
index a5633ea..a9b78eb 100644
--- a/JavaScriptCore/wtf/FastMalloc.cpp
+++ b/JavaScriptCore/wtf/FastMalloc.cpp
@@ -3795,7 +3795,7 @@ void* realloc(void* old_ptr, size_t new_size) {
     return new_ptr;
   } else {
 #if ENABLE(FAST_MALLOC_MATCH_VALIDATION)
-    old_ptr = pByte + sizeof(AllocAlignmentInteger);  // Set old_ptr back to the user pointer.
+    old_ptr += sizeof(AllocAlignmentInteger); // Set old_ptr back to the user pointer.
 #endif
     return old_ptr;
   }

-- 
WebKit Debian packaging