Title: [115969] trunk/Source/WebCore
- Revision
- 115969
- Author
- pfeld...@chromium.org
- Date
- 2012-05-03 06:35:12 -0700 (Thu, 03 May 2012)
Log Message
Web Inspector: EXC_BAD_ACCESS in DOM breakpoint processing code.
https://bugs.webkit.org/show_bug.cgi?id=85482
Reviewed by Yury Semikhatsky.
0 check added since we are guaranteed to get immediate parent, but not the whole ancestor tree.
* inspector/InspectorDOMDebuggerAgent.cpp:
(WebCore::InspectorDOMDebuggerAgent::descriptionForDOMEvent):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (115968 => 115969)
--- trunk/Source/WebCore/ChangeLog 2012-05-03 13:24:06 UTC (rev 115968)
+++ trunk/Source/WebCore/ChangeLog 2012-05-03 13:35:12 UTC (rev 115969)
@@ -1,3 +1,15 @@
+2012-05-03 Pavel Feldman <pfeld...@chromium.org>
+
+ Web Inspector: EXC_BAD_ACCESS in DOM breakpoint processing code.
+ https://bugs.webkit.org/show_bug.cgi?id=85482
+
+ Reviewed by Yury Semikhatsky.
+
+ 0 check added since we are guaranteed to get immediate parent, but not the whole ancestor tree.
+
+ * inspector/InspectorDOMDebuggerAgent.cpp:
+ (WebCore::InspectorDOMDebuggerAgent::descriptionForDOMEvent):
+
2012-05-03 Ilya Tikhonovsky <loi...@chromium.org>
Web Inspector: compile time ambiguity happens when I try to assign a TypeBuilder object to an out argument.
Modified: trunk/Source/WebCore/inspector/InspectorDOMDebuggerAgent.cpp (115968 => 115969)
--- trunk/Source/WebCore/inspector/InspectorDOMDebuggerAgent.cpp 2012-05-03 13:24:06 UTC (rev 115968)
+++ trunk/Source/WebCore/inspector/InspectorDOMDebuggerAgent.cpp 2012-05-03 13:35:12 UTC (rev 115969)
@@ -315,8 +315,10 @@
breakpointOwner = InspectorDOMAgent::innerParentNode(target);
ASSERT(breakpointOwner);
while (!(m_domBreakpoints.get(breakpointOwner) & (1 << breakpointType))) {
- breakpointOwner = InspectorDOMAgent::innerParentNode(breakpointOwner);
- ASSERT(breakpointOwner);
+ Node* parentNode = InspectorDOMAgent::innerParentNode(breakpointOwner);
+ if (!parentNode)
+ break;
+ breakpointOwner = parentNode;
}
if (breakpointType == SubtreeModified)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
