diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-10-14 14:08:44 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-10-14 14:08:44 +0200 |
| commit | 5a45e3b78724563f05d62569d8ed31adc4ffd342 (patch) | |
| tree | e4da5c78062384641b6d23e6b74c038664d82417 /Source/JavaScriptCore/runtime/JSString.cpp | |
| parent | 0b6f959022700ecf9374bdbb13772242d3f7e617 (diff) | |
| parent | 946088cf515ec30de586392ec72e4658b86650a4 (diff) | |
| download | qtwebkit-5a45e3b78724563f05d62569d8ed31adc4ffd342.tar.gz | |
Merge remote-tracking branch 'origin/5.3' into 5.4
Change-Id: I509f0440296df39aece8133382aacc43a4e05f99
Diffstat (limited to 'Source/JavaScriptCore/runtime/JSString.cpp')
| -rw-r--r-- | Source/JavaScriptCore/runtime/JSString.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Source/JavaScriptCore/runtime/JSString.cpp b/Source/JavaScriptCore/runtime/JSString.cpp index 86704d715..6f0b09d13 100644 --- a/Source/JavaScriptCore/runtime/JSString.cpp +++ b/Source/JavaScriptCore/runtime/JSString.cpp @@ -40,6 +40,7 @@ void JSRopeString::RopeBuilder::expand() { ASSERT(m_index == JSRopeString::s_maxInternalRopeLength); JSString* jsString = m_jsString; + RELEASE_ASSERT(jsString); m_jsString = jsStringBuilder(&m_vm); m_index = 0; append(jsString); |