diff options
| author | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2014-10-14 17:18:28 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-10-14 20:26:43 +0200 |
| commit | 520572a67c4e747583792b256702c488b74bff3d (patch) | |
| tree | 2144cf369c2f49754c6e9242e5ea901616735de5 /Source/JavaScriptCore/runtime/JSString.cpp | |
| parent | c3b2b9d23396e4853d152bef5479d8f05d651e27 (diff) | |
| parent | 5a45e3b78724563f05d62569d8ed31adc4ffd342 (diff) | |
| download | qtwebkit-520572a67c4e747583792b256702c488b74bff3d.tar.gz | |
Merge "Merge remote-tracking branch 'origin/5.3' into 5.4" into refs/staging/5.4
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); |