JavaScriptCore-7600.1.4.9.tar.gz

[apple/javascriptcore.git] / runtime / JSStringJoiner.cpp

diff --git a/runtime/JSStringJoiner.cpp b/runtime/JSStringJoiner.cpp
index ea260243b7c4437f11f9942e8a86141f600ca617..f9870c3423b4ad1119825bf51df137a821a03cc2 100644 (file)
--- a/runtime/JSStringJoiner.cpp
+++ b/runtime/JSStringJoiner.cpp
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (C) 2012 Apple Inc. All rights reserved.
+ * Copyright (C) 2012, 2013 Apple Inc. All rights reserved.

  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions


@@ -27,15 +27,15 @@
 #include "JSStringJoiner.h"
 
 #include "ExceptionHelpers.h"
 #include "JSStringJoiner.h"
 
 #include "ExceptionHelpers.h"

+#include "JSScope.h"

 #include "JSString.h"
 #include "JSString.h"

-#include "ScopeChain.h"
+#include "JSCInlines.h"

 #include <wtf/text/StringImpl.h>
 
 #include <wtf/text/StringImpl.h>
 

-

 namespace JSC {
 
 // The destination is 16bits, at least one string is 16 bits.
 namespace JSC {
 
 // The destination is 16bits, at least one string is 16 bits.

-static inline void appendStringToData(UChar*& data, const UString& string)
+static inline void appendStringToData(UChar*& data, const String& string)

 {
     if (string.isNull())
         return;
 {
     if (string.isNull())
         return;


@@ -57,7 +57,7 @@ static inline void appendStringToData(UChar*& data, const UString& string)
 }
 
 // If the destination is 8bits, we know every string has to be 8bit.
 }
 
 // If the destination is 8bits, we know every string has to be 8bit.

-static inline void appendStringToData(LChar*& data, const UString& string)
+static inline void appendStringToData(LChar*& data, const String& string)

 {
     if (string.isNull())
         return;
 {
     if (string.isNull())
         return;


@@ -73,16 +73,16 @@ static inline void appendStringToData(LChar*& data, const UString& string)
 }
 
 template<typename CharacterType>
 }
 
 template<typename CharacterType>

-static inline PassRefPtr<StringImpl> joinStrings(const Vector<UString>& strings, const UString& separator, unsigned outputLength)
+static inline PassRefPtr<StringImpl> joinStrings(const Vector<String>& strings, const String& separator, unsigned outputLength)

 {
     ASSERT(outputLength);
 
     CharacterType* data;
     RefPtr<StringImpl> outputStringImpl = StringImpl::tryCreateUninitialized(outputLength, data);
     if (!outputStringImpl)
 {
     ASSERT(outputLength);
 
     CharacterType* data;
     RefPtr<StringImpl> outputStringImpl = StringImpl::tryCreateUninitialized(outputLength, data);
     if (!outputStringImpl)

-        return PassRefPtr<StringImpl>();
+        return nullptr;

 
 

-    const UString firstString = strings.first();
+    const String firstString = strings.first();

     appendStringToData(data, firstString);
 
     for (size_t i = 1; i < strings.size(); ++i) {
     appendStringToData(data, firstString);
 
     for (size_t i = 1; i < strings.size(); ++i) {


@@ -90,11 +90,11 @@ static inline PassRefPtr<StringImpl> joinStrings(const Vector<UString>& strings,
         appendStringToData(data, strings[i]);
     }
 
         appendStringToData(data, strings[i]);
     }
 

-    ASSERT(data == (outputStringImpl->getCharacters<CharacterType>() + outputStringImpl->length()));
+    ASSERT(data == (outputStringImpl->characters<CharacterType>() + outputStringImpl->length()));

     return outputStringImpl.release();
 }
 
     return outputStringImpl.release();
 }
 

-JSValue JSStringJoiner::build(ExecState* exec)
+JSValue JSStringJoiner::join(ExecState* exec)

 {
     if (!m_isValid)
         return throwOutOfMemoryError(exec);
 {
     if (!m_isValid)
         return throwOutOfMemoryError(exec);


@@ -102,25 +102,29 @@ JSValue JSStringJoiner::build(ExecState* exec)
     if (!m_strings.size())
         return jsEmptyString(exec);
 
     if (!m_strings.size())
         return jsEmptyString(exec);
 

-    size_t separatorLength = m_separator.length();
+    Checked<unsigned, RecordOverflow> separatorLength = m_separator.length();

     // FIXME: add special cases of joinStrings() for (separatorLength == 0) and (separatorLength == 1).
     ASSERT(m_strings.size() > 0);
     // FIXME: add special cases of joinStrings() for (separatorLength == 0) and (separatorLength == 1).
     ASSERT(m_strings.size() > 0);

-    size_t totalSeparactorsLength = separatorLength * (m_strings.size() - 1);
-    size_t outputStringSize = totalSeparactorsLength + m_cumulatedStringsLength;
+    Checked<unsigned, RecordOverflow> totalSeparactorsLength = separatorLength * (m_strings.size() - 1);
+    Checked<unsigned, RecordOverflow> outputStringSize = totalSeparactorsLength + m_accumulatedStringsLength;

 
 

+    unsigned finalSize;
+    if (outputStringSize.safeGet(finalSize) == CheckedState::DidOverflow)
+        return throwOutOfMemoryError(exec);
+        

     if (!outputStringSize)
         return jsEmptyString(exec);
 
     RefPtr<StringImpl> outputStringImpl;
     if (m_is8Bits)
     if (!outputStringSize)
         return jsEmptyString(exec);
 
     RefPtr<StringImpl> outputStringImpl;
     if (m_is8Bits)

-        outputStringImpl = joinStrings<LChar>(m_strings, m_separator, outputStringSize);
+        outputStringImpl = joinStrings<LChar>(m_strings, m_separator, finalSize);

     else
     else

-        outputStringImpl = joinStrings<UChar>(m_strings, m_separator, outputStringSize);
+        outputStringImpl = joinStrings<UChar>(m_strings, m_separator, finalSize);

 
     if (!outputStringImpl)
         return throwOutOfMemoryError(exec);
 
 
     if (!outputStringImpl)
         return throwOutOfMemoryError(exec);
 

-    return JSString::create(exec->globalData(), outputStringImpl.release());
+    return JSString::create(exec->vm(), outputStringImpl.release());

 }
 
 }
 }
 
 }