[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.21-584-g1e41756

[barraclough at apple.com]

The following commit has been merged in the webkit-1.1 branch:
commit 8867fae79f9c64fb210b96a5609db312e1daba2a
Author: barraclough at apple.com <barraclough at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Feb 15 21:43:27 2010 +0000

    Rubber Stamped by Geoff Garen.
    
    Bug 34948 - tryMakeString should fail on error in length calculation
    
    Ooops! - "bool overflow" argument should have been "bool& overflow".
    
    * runtime/UString.h:
    (JSC::sumWithOverflow):
    (JSC::tryMakeString):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54795 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 60c7572..7f68159 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,5 +1,17 @@
 2010-02-15  Gavin Barraclough  <barraclough at apple.com>
 
+        Rubber Stamped by Geoff Garen.
+
+        Bug 34948 - tryMakeString should fail on error in length calculation
+
+        Ooops! - "bool overflow" argument should have been "bool& overflow".
+
+        * runtime/UString.h:
+        (JSC::sumWithOverflow):
+        (JSC::tryMakeString):
+
+2010-02-15  Gavin Barraclough  <barraclough at apple.com>
+
         Reviewed by NOBODY (Build Fix (pt 2!)).
 
         Some symbol names have changed, remove, will readd if required.
diff --git a/JavaScriptCore/runtime/UString.h b/JavaScriptCore/runtime/UString.h
index 6cf0386..6382edb 100644
--- a/JavaScriptCore/runtime/UString.h
+++ b/JavaScriptCore/runtime/UString.h
@@ -325,7 +325,7 @@ namespace JSC {
         unsigned m_length;
     };
 
-    inline void sumWithOverflow(unsigned& total, unsigned addend, bool overflow)
+    inline void sumWithOverflow(unsigned& total, unsigned addend, bool& overflow)
     {
         unsigned oldTotal = total;
         total = oldTotal + addend;

-- 
WebKit Debian packaging