Changeset 120456 in webkit

Timestamp:

Jun 15, 2012, 7:28:20 AM (14 years ago)

Author:

loislo@chromium.org

Message:

Web Inspector: CRASH: getProfile is crashing for unknown profiles.
​https://bugs.webkit.org/show_bug.cgi?id=89202

Source/WebCore:

agents' functions have to set a value to errorString if it can't assign values to the mandatory out arguments.

Reviewed by Pavel Feldman.

Test: inspector/profiler/heap-snapshot-get-profile-crash.html

• inspector/InspectorProfilerAgent.cpp:

(WebCore::InspectorProfilerAgent::getProfile):

LayoutTests:

Reviewed by Pavel Feldman.

• inspector/profiler/heap-snapshot-get-profile-crash-expected.txt: Added.
• inspector/profiler/heap-snapshot-get-profile-crash.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/inspector/profiler/heap-snapshot-get-profile-crash-expected.txt (added)
• LayoutTests/inspector/profiler/heap-snapshot-get-profile-crash.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/inspector/InspectorProfilerAgent.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-06-15  Ilya Tikhonovsky  <loislo@chromium.org>
+
+        Web Inspector: CRASH: getProfile is crashing for unknown profiles.
+        https://bugs.webkit.org/show_bug.cgi?id=89202
+
+        Reviewed by Pavel Feldman.
+
+        * inspector/profiler/heap-snapshot-get-profile-crash-expected.txt: Added.
+        * inspector/profiler/heap-snapshot-get-profile-crash.html: Added.
+
 2012-06-15  Kent Tamura  <tkent@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-06-15  Ilya Tikhonovsky  <loislo@chromium.org>
+
+        Web Inspector: CRASH: getProfile is crashing for unknown profiles.
+        https://bugs.webkit.org/show_bug.cgi?id=89202
+
+        agents' functions have to set a value to errorString if it can't assign values to the mandatory out arguments.
+
+        Reviewed by Pavel Feldman.
+
+        Test: inspector/profiler/heap-snapshot-get-profile-crash.html
+
+        * inspector/InspectorProfilerAgent.cpp:
+        (WebCore::InspectorProfilerAgent::getProfile):
+
 2012-06-15  Max Feil  <mfeil@rim.com>
 

trunk/Source/WebCore/inspector/InspectorProfilerAgent.cpp

@@ -268 +268 @@
 } // namespace
 
-void InspectorProfilerAgent::getProfile(ErrorString*, const String& type, int rawUid, RefPtr<TypeBuilder::Profiler::Profile>& profileObject)
+void InspectorProfilerAgent::getProfile(ErrorString* errorString, const String& type, int rawUid, RefPtr<TypeBuilder::Profiler::Profile>& profileObject)
 {
     unsigned uid = static_cast<unsigned>(rawUid);
     if (type == CPUProfileType) {
         ProfilesMap::iterator it = m_profiles.find(uid);
-        if (it != m_profiles.end()) {
-            profileObject = TypeBuilder::Profiler::Profile::create();
-            profileObject->setHead(it->second->buildInspectorObjectForHead());
-            if (it->second->bottomUpHead())
-                profileObject->setBottomUpHead(it->second->buildInspectorObjectForBottomUpHead());
+        if (it == m_profiles.end()) {
+            *errorString = "Profile wasn't found";
+            return;
         }
+        profileObject = TypeBuilder::Profiler::Profile::create();
+        profileObject->setHead(it->second->buildInspectorObjectForHead());
+        if (it->second->bottomUpHead())
+            profileObject->setBottomUpHead(it->second->buildInspectorObjectForBottomUpHead());
     } else if (type == HeapProfileType) {
         HeapSnapshotsMap::iterator it = m_snapshots.find(uid);
-        if (it != m_snapshots.end()) {
-            RefPtr<ScriptHeapSnapshot> snapshot = it->second;
-            profileObject = TypeBuilder::Profiler::Profile::create();
-            if (m_frontend) {
-                OutputStream stream(m_frontend, uid);
-                snapshot->writeJSON(&stream);
-            }
+        if (it == m_snapshots.end()) {
+            *errorString = "Profile wasn't found";
+            return;
+        }
+        RefPtr<ScriptHeapSnapshot> snapshot = it->second;
+        profileObject = TypeBuilder::Profiler::Profile::create();
+        if (m_frontend) {
+            OutputStream stream(m_frontend, uid);
+            snapshot->writeJSON(&stream);
         }
     }