Title: [120470] trunk/Source/WebCore
- Revision
- 120470
- Author
- [email protected]
- Date
- 2012-06-15 09:48:21 -0700 (Fri, 15 Jun 2012)
Log Message
Web Inspector: CRASH when DebuggerAgent.setBreakpoint was called twice for the same location.
https://bugs.webkit.org/show_bug.cgi?id=89225
Reviewed by Pavel Feldman.
* inspector/InspectorDebuggerAgent.cpp:
(WebCore::InspectorDebuggerAgent::setBreakpoint):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (120469 => 120470)
--- trunk/Source/WebCore/ChangeLog 2012-06-15 16:36:17 UTC (rev 120469)
+++ trunk/Source/WebCore/ChangeLog 2012-06-15 16:48:21 UTC (rev 120470)
@@ -1,3 +1,13 @@
+2012-06-15 Ilya Tikhonovsky <[email protected]>
+
+ Web Inspector: CRASH when DebuggerAgent.setBreakpoint was called twice for the same location.
+ https://bugs.webkit.org/show_bug.cgi?id=89225
+
+ Reviewed by Pavel Feldman.
+
+ * inspector/InspectorDebuggerAgent.cpp:
+ (WebCore::InspectorDebuggerAgent::setBreakpoint):
+
2012-06-08 Alexander Pavlov <[email protected]>
Web Inspector: CSSParser::parseSheet() should provide ready-to-use source data
Modified: trunk/Source/WebCore/inspector/InspectorDebuggerAgent.cpp (120469 => 120470)
--- trunk/Source/WebCore/inspector/InspectorDebuggerAgent.cpp 2012-06-15 16:36:17 UTC (rev 120469)
+++ trunk/Source/WebCore/inspector/InspectorDebuggerAgent.cpp 2012-06-15 16:48:21 UTC (rev 120470)
@@ -273,8 +273,10 @@
String condition = optionalCondition ? *optionalCondition : emptyString();
String breakpointId = scriptId + ':' + String::number(lineNumber) + ':' + String::number(columnNumber);
- if (m_breakpointIdToDebugServerBreakpointIds.find(breakpointId) != m_breakpointIdToDebugServerBreakpointIds.end())
+ if (m_breakpointIdToDebugServerBreakpointIds.find(breakpointId) != m_breakpointIdToDebugServerBreakpointIds.end()) {
+ *errorString = "Breakpoint at specified location already exists.";
return;
+ }
ScriptBreakpoint breakpoint(lineNumber, columnNumber, condition);
actualLocation = resolveBreakpoint(breakpointId, scriptId, breakpoint);
if (actualLocation)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
