[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373
barraclough at apple.com
barraclough at apple.com
Thu Apr 8 01:48:05 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit 98a96e3a6554c3b1adc2b3c69f19f4c218864b71
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
More information about the Pkg-webkit-commits
mailing list