Changeset 122648 in webkit

Timestamp:

Jul 13, 2012 5:33:28 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

Fix for WebContext::getWebCoreStatistics() causes crash if no m_process
​https://bugs.webkit.org/show_bug.cgi?id=91116

.:

Patch by Josh Hawn <​jhawn@apple.com> on 2012-07-12
Reviewed by Simon Fraser.

• Source/WebKit2/UIProcess/WebContext.cpp: WebContext::getWebCoreStatistics():

Now invalidates callback if no m_process.

Tools:

Patch by Josh Hawn <​jhawn@apple.com> on 2012-07-13
Reviewed by Simon Fraser.

• TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:

Added new test file.

• TestWebKitAPI/Tests/WebKit2/WebCoreStatisticsWithNoWebProcess.cpp: Added.

(TestWebKitAPI::wkContextGetStatisticsCallback):

Tests that callback function receives an error.

(TestWebKitAPI::TEST):

Creates a dummy web context object (no web process).
Calls WKContextGetStatistics with the web context and test callback.
The test callback should get an expected error.

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• Source/WebKit2/UIProcess/WebContext.cpp (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj (modified) (4 diffs)
• Tools/TestWebKitAPI/Tests/WebKit2/WebCoreStatisticsWithNoWebProcess.cpp (added)

trunk/ChangeLog

@@ +1 @@
+2012-07-12 Josh Hawn <jhawn@apple.com>
+
+        Fix for WebContext::getWebCoreStatistics() causes crash if no m_process
+        https://bugs.webkit.org/show_bug.cgi?id=91116
+
+        Reviewed by Simon Fraser.
+
+        * Source/WebKit2/UIProcess/WebContext.cpp:
+          WebContext::getWebCoreStatistics():
+                Now invalidates callback if no m_process.
+
 2012-07-13  Thiago Marcos P. Santos  <thiago.santos@intel.com>
 

trunk/Source/WebKit2/UIProcess/WebContext.cpp

@@ -970 +970 @@
 }
 
-void WebContext::getWebCoreStatistics(PassRefPtr<DictionaryCallback> prpCallback)
-{
-    RefPtr<DictionaryCallback> callback = prpCallback;
+void WebContext::getWebCoreStatistics(PassRefPtr<DictionaryCallback> callback)
+{
+    if (!m_process) {
+        callback->invalidate();
+        return;
+    }
     
     uint64_t callbackID = callback->callbackID();

trunk/Tools/ChangeLog

@@ +1 @@
+2012-07-13  Josh Hawn  <jhawn@apple.com>
+
+        Fix for WebContext::getWebCoreStatistics() causes crash if no m_process
+        https://bugs.webkit.org/show_bug.cgi?id=91116
+
+        Reviewed by Simon Fraser.
+
+        * TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
+            Added new test file.
+        * TestWebKitAPI/Tests/WebKit2/WebCoreStatisticsWithNoWebProcess.cpp: Added.
+        (TestWebKitAPI::wkContextGetStatisticsCallback):
+            Tests that callback function receives an error.
+        (TestWebKitAPI::TEST):
+            Creates a dummy web context object (no web process).
+            Calls WKContextGetStatistics with the web context and test callback.
+            The test callback should get an expected error.
+
 2012-07-13  Dirk Pranke  <dpranke@chromium.org>
 

trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj

@@ -10 +10 @@
                 0BCD833514857CE400EA2003 /* HashMap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0BCD833414857CE400EA2003 /* HashMap.cpp */; };
                 0BCD856A1485C98B00EA2003 /* TemporaryChange.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0BCD85691485C98B00EA2003 /* TemporaryChange.cpp */; };
+                0F17BBD615AF6C4D007AB753 /* WebCoreStatisticsWithNoWebProcess.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0F17BBD415AF6C4D007AB753 /* WebCoreStatisticsWithNoWebProcess.cpp */; };
                 0FC6C4CC141027E0005B7F0C /* RedBlackTree.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0FC6C4CB141027E0005B7F0C /* RedBlackTree.cpp */; };
                 0FC6C4CF141034AD005B7F0C /* MetaAllocator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0FC6C4CE141034AD005B7F0C /* MetaAllocator.cpp */; };
@@ -230 +231 @@
                 0BCD833414857CE400EA2003 /* HashMap.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = HashMap.cpp; path = WTF/HashMap.cpp; sourceTree = "<group>"; };
                 0BCD85691485C98B00EA2003 /* TemporaryChange.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = TemporaryChange.cpp; path = WTF/TemporaryChange.cpp; sourceTree = "<group>"; };
+                0F17BBD415AF6C4D007AB753 /* WebCoreStatisticsWithNoWebProcess.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebCoreStatisticsWithNoWebProcess.cpp; sourceTree = "<group>"; };
                 0FC6C4CB141027E0005B7F0C /* RedBlackTree.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = RedBlackTree.cpp; path = WTF/RedBlackTree.cpp; sourceTree = "<group>"; };
                 0FC6C4CE141034AD005B7F0C /* MetaAllocator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = MetaAllocator.cpp; path = WTF/MetaAllocator.cpp; sourceTree = "<group>"; };
@@ -597 +599 @@
                                 BC90995D12567BC100083756 /* WKString.cpp */,
                                 BC9099931256ACF100083756 /* WKStringJSString.cpp */,
+                                0F17BBD415AF6C4D007AB753 /* WebCoreStatisticsWithNoWebProcess.cpp */,
                         );
                         path = WebKit2;
@@ -930 +933 @@
                                 F660AA0D15A5F061003A1243 /* GetInjectedBundleInitializationUserDataCallback.cpp in Sources */,
                                 F660AA1315A619C9003A1243 /* InjectedBundleInitializationUserDataCallbackWins.cpp in Sources */,
+                                0F17BBD615AF6C4D007AB753 /* WebCoreStatisticsWithNoWebProcess.cpp in Sources */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;