Changeset 66674 in webkit
- Timestamp:
- Sep 2, 2010 10:10:38 AM (14 years ago)
- Location:
- trunk/WebCore
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebCore/ChangeLog
r66671 r66674 1 2010-09-02 Ilya Tikhonovsky <loislo@chromium.org> 2 3 Reviewed by Yury Semikhatsky. 4 5 WebInspector: Timeline instrumentation code can crash browser. 6 7 Steps: 8 1) load the site 9 2) open inspector 10 3) start timeline recording 11 4) reload inspected page 12 got NPE 13 14 https://bugs.webkit.org/show_bug.cgi?id=45098 15 16 * loader/ResourceLoader.cpp: 17 (WebCore::ResourceLoader::didReceiveResponse): 18 (WebCore::ResourceLoader::didReceiveData): 19 1 20 2010-09-02 Nate Chapin <japhet@chromium.org> 2 21 -
trunk/WebCore/loader/ResourceLoader.cpp
r65827 r66674 402 402 #if ENABLE(INSPECTOR) 403 403 if (InspectorTimelineAgent::instanceCount()) { 404 InspectorTimelineAgent* timelineAgent = m_frame->page() ? m_frame->page()->inspectorTimelineAgent() : 0;404 InspectorTimelineAgent* timelineAgent = (m_frame && m_frame->page()) ? m_frame->page()->inspectorTimelineAgent() : 0; 405 405 if (timelineAgent) 406 406 timelineAgent->willReceiveResourceResponse(identifier(), response); … … 414 414 #if ENABLE(INSPECTOR) 415 415 if (InspectorTimelineAgent::instanceCount()) { 416 InspectorTimelineAgent* timelineAgent = m_frame->page() ? m_frame->page()->inspectorTimelineAgent() : 0;416 InspectorTimelineAgent* timelineAgent = (m_frame && m_frame->page()) ? m_frame->page()->inspectorTimelineAgent() : 0; 417 417 if (timelineAgent) 418 418 timelineAgent->didReceiveResourceResponse(); … … 425 425 #if ENABLE(INSPECTOR) 426 426 if (InspectorTimelineAgent::instanceCount()) { 427 InspectorTimelineAgent* timelineAgent = m_frame->page() ? m_frame->page()->inspectorTimelineAgent() : 0;427 InspectorTimelineAgent* timelineAgent = (m_frame && m_frame->page()) ? m_frame->page()->inspectorTimelineAgent() : 0; 428 428 if (timelineAgent) 429 429 timelineAgent->willReceiveResourceData(identifier()); … … 433 433 #if ENABLE(INSPECTOR) 434 434 if (InspectorTimelineAgent::instanceCount()) { 435 InspectorTimelineAgent* timelineAgent = m_frame->page() ? m_frame->page()->inspectorTimelineAgent() : 0;435 InspectorTimelineAgent* timelineAgent = (m_frame && m_frame->page()) ? m_frame->page()->inspectorTimelineAgent() : 0; 436 436 if (timelineAgent) 437 437 timelineAgent->didReceiveResourceData();
Note: See TracChangeset
for help on using the changeset viewer.