Changeset 72209 in webkit for trunk/JavaScriptCore/wtf/text/WTFString.cpp

Timestamp:

Nov 17, 2010, 8:36:04 AM (15 years ago)

Author:

[email protected]

Message:

<​http://webkit.org/b/49634> Make overflow guards in WTF::String::utf8 explicit

Reviewed by Darin Adler.

Add an explicit overflow check prior to allocating our buffer,
rather than implicitly relying on the guard in convertUTF16ToUTF8.

• wtf/text/WTFString.cpp:

(WTF::String::utf8):

File:

• trunk/JavaScriptCore/wtf/text/WTFString.cpp (modified) (2 diffs)

trunk/JavaScriptCore/wtf/text/WTFString.cpp

@@ -37 +37 @@
 
 using namespace Unicode;
+using namespace std;
 
 // Construct a string with UTF-16 data.
@@ -697 +698 @@
     //    have a good chance of being able to write the string into the
     //    buffer without reallocing (say, 1.5 x length).
+    if (length > numeric_limits<unsigned>::max() / 3)
+        return CString();
     Vector<char, 1024> bufferVector(length * 3);