Changeset 208968 in webkit for trunk/Source/JavaScriptCore/profiler/ProfilerBytecodeSequence.cpp

Timestamp:

Nov 22, 2016, 12:52:05 PM (9 years ago)

Author:

[email protected]

Message:

Fix exception scope verification failures in JSC profiler files.
​https://bugs.webkit.org/show_bug.cgi?id=164971

Reviewed by Saam Barati.

• profiler/ProfilerBytecodeSequence.cpp:

(JSC::Profiler::BytecodeSequence::addSequenceProperties):

• profiler/ProfilerCompilation.cpp:

(JSC::Profiler::Compilation::toJS):

• profiler/ProfilerDatabase.cpp:

(JSC::Profiler::Database::toJS):
(JSC::Profiler::Database::toJSON):

• profiler/ProfilerOSRExitSite.cpp:

(JSC::Profiler::OSRExitSite::toJS):

• profiler/ProfilerOriginStack.cpp:

(JSC::Profiler::OriginStack::toJS):

File:

• trunk/Source/JavaScriptCore/profiler/ProfilerBytecodeSequence.cpp (modified) (1 diff)

trunk/Source/JavaScriptCore/profiler/ProfilerBytecodeSequence.cpp

@@ -83 +83 @@
     JSArray* header = constructEmptyArray(exec, 0);
     RETURN_IF_EXCEPTION(scope, void());
-    for (unsigned i = 0; i < m_header.size(); ++i)
+    for (unsigned i = 0; i < m_header.size(); ++i) {
         header->putDirectIndex(exec, i, jsString(exec, String::fromUTF8(m_header[i])));
+        RETURN_IF_EXCEPTION(scope, void());
+    }
     result->putDirect(vm, exec->propertyNames().header, header);
     
     JSArray* sequence = constructEmptyArray(exec, 0);
     RETURN_IF_EXCEPTION(scope, void());
-    for (unsigned i = 0; i < m_sequence.size(); ++i)
+    for (unsigned i = 0; i < m_sequence.size(); ++i) {
         sequence->putDirectIndex(exec, i, m_sequence[i].toJS(exec));
+        RETURN_IF_EXCEPTION(scope, void());
+    }
     result->putDirect(vm, exec->propertyNames().bytecode, sequence);
 }