Title: [171755] branches/safari-600.1.4-branch/Source/_javascript_Core
- Revision
- 171755
- Author
- matthew_han...@apple.com
- Date
- 2014-07-29 13:32:39 -0700 (Tue, 29 Jul 2014)
Log Message
Merge r171688. <rdar://problem/17364180>
Modified Paths
Diff
Modified: branches/safari-600.1.4-branch/Source/_javascript_Core/ChangeLog (171754 => 171755)
--- branches/safari-600.1.4-branch/Source/_javascript_Core/ChangeLog 2014-07-29 20:26:21 UTC (rev 171754)
+++ branches/safari-600.1.4-branch/Source/_javascript_Core/ChangeLog 2014-07-29 20:32:39 UTC (rev 171755)
@@ -1,3 +1,18 @@
+2014-07-29 Matthew Hanson <matthew_han...@apple.com>
+
+ Merge r171688. <rdar://problem/17364180>
+
+ 2014-07-28 Joseph Pecoraro <pecor...@apple.com>
+
+ JSContext Inspector: crash when using step-into
+ https://bugs.webkit.org/show_bug.cgi?id=135345
+
+ Reviewed by Timothy Hatcher.
+
+ * inspector/agents/InspectorDebuggerAgent.cpp:
+ (Inspector::InspectorDebuggerAgent::stepInto):
+ Null check m_listener since it may not be set.
+
2014-07-25 Lucas Forschler <lforsch...@apple.com>
Merge r171578
Modified: branches/safari-600.1.4-branch/Source/_javascript_Core/inspector/agents/InspectorDebuggerAgent.cpp (171754 => 171755)
--- branches/safari-600.1.4-branch/Source/_javascript_Core/inspector/agents/InspectorDebuggerAgent.cpp 2014-07-29 20:26:21 UTC (rev 171754)
+++ branches/safari-600.1.4-branch/Source/_javascript_Core/inspector/agents/InspectorDebuggerAgent.cpp 2014-07-29 20:32:39 UTC (rev 171755)
@@ -483,7 +483,9 @@
m_injectedScriptManager->releaseObjectGroup(InspectorDebuggerAgent::backtraceObjectGroup);
scriptDebugServer().stepIntoStatement();
- m_listener->stepInto();
+
+ if (m_listener)
+ m_listener->stepInto();
}
void InspectorDebuggerAgent::stepOut(ErrorString* errorString)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
