Title: [163191] trunk/Source/WebCore
- Revision
- 163191
- Author
- [email protected]
- Date
- 2014-01-31 13:11:35 -0800 (Fri, 31 Jan 2014)
Log Message
Properly handle cases where a profile couldn't be recorded and null is returned.
<rdar://problem/15957993> Crash with Inspector open at WebCore::ScriptProfile::buildInspectorObject
Reviewed by Joseph Pecoraro.
* inspector/InspectorTimelineAgent.cpp:
(WebCore::InspectorTimelineAgent::didCallFunction): Null check profile.
(WebCore::InspectorTimelineAgent::didEvaluateScript): Ditto.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (163190 => 163191)
--- trunk/Source/WebCore/ChangeLog 2014-01-31 21:06:38 UTC (rev 163190)
+++ trunk/Source/WebCore/ChangeLog 2014-01-31 21:11:35 UTC (rev 163191)
@@ -1,3 +1,15 @@
+2014-01-31 Timothy Hatcher <[email protected]>
+
+ Properly handle cases where a profile couldn't be recorded and null is returned.
+
+ <rdar://problem/15957993> Crash with Inspector open at WebCore::ScriptProfile::buildInspectorObject
+
+ Reviewed by Joseph Pecoraro.
+
+ * inspector/InspectorTimelineAgent.cpp:
+ (WebCore::InspectorTimelineAgent::didCallFunction): Null check profile.
+ (WebCore::InspectorTimelineAgent::didEvaluateScript): Ditto.
+
2014-01-31 Beth Dakin <[email protected]>
Extended background should only create margin tiles for pages with background
Modified: trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp (163190 => 163191)
--- trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp 2014-01-31 21:06:38 UTC (rev 163190)
+++ trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp 2014-01-31 21:11:35 UTC (rev 163191)
@@ -155,7 +155,8 @@
ASSERT(entry.type == TimelineRecordType::FunctionCall);
RefPtr<ScriptProfile> profile = "" debuggerWorld())->globalExec(), ASCIILiteral("Timeline FunctionCall"));
- TimelineRecordFactory::appendProfile(entry.data.get(), profile.release());
+ if (profile)
+ TimelineRecordFactory::appendProfile(entry.data.get(), profile.release());
m_recordingProfile = false;
}
@@ -335,7 +336,8 @@
ASSERT(entry.type == TimelineRecordType::EvaluateScript);
RefPtr<ScriptProfile> profile = "" debuggerWorld())->globalExec(), ASCIILiteral("Timeline EvaluateScript"));
- TimelineRecordFactory::appendProfile(entry.data.get(), profile.release());
+ if (profile)
+ TimelineRecordFactory::appendProfile(entry.data.get(), profile.release());
m_recordingProfile = false;
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
