- Revision
- 198604
- Author
- [email protected]
- Date
- 2016-03-23 16:47:29 -0700 (Wed, 23 Mar 2016)
Log Message
Crash when using KVO from within -[WebView initWithCoder:]
https://bugs.webkit.org/show_bug.cgi?id=155816
rdar://problem/17073265
Reviewed by Dan Bernstein.
Source/WebKit/mac:
Get rid of the observationInfo getter and setter. It's not clear why they were added (in 2003),
and the methods on NSObject are good enough for us.
* WebView/WebView.mm:
(-[WebView setObservationInfo:]): Deleted.
(-[WebView observationInfo]): Deleted.
* WebView/WebViewData.h:
Tools:
Add test.
* TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
* TestWebKitAPI/Tests/mac/EarlyKVOCrash.mm: Added.
(-[EarlyKVOCrashResponder initWithWebView:]):
(-[EarlyKVOCrashResponder initWithCoder:]):
(-[EarlyKVOCrashResponder dealloc]):
(-[EarlyKVOCrashResponder encodeWithCoder:]):
(TestWebKitAPI::TEST):
Modified Paths
Added Paths
Diff
Modified: trunk/Source/WebKit/mac/ChangeLog (198603 => 198604)
--- trunk/Source/WebKit/mac/ChangeLog 2016-03-23 23:42:18 UTC (rev 198603)
+++ trunk/Source/WebKit/mac/ChangeLog 2016-03-23 23:47:29 UTC (rev 198604)
@@ -1,3 +1,19 @@
+2016-03-23 Anders Carlsson <[email protected]>
+
+ Crash when using KVO from within -[WebView initWithCoder:]
+ https://bugs.webkit.org/show_bug.cgi?id=155816
+ rdar://problem/17073265
+
+ Reviewed by Dan Bernstein.
+
+ Get rid of the observationInfo getter and setter. It's not clear why they were added (in 2003),
+ and the methods on NSObject are good enough for us.
+
+ * WebView/WebView.mm:
+ (-[WebView setObservationInfo:]): Deleted.
+ (-[WebView observationInfo]): Deleted.
+ * WebView/WebViewData.h:
+
2016-03-22 Beth Dakin <[email protected]>
Advanced spell checking should be guarded behind
Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (198603 => 198604)
--- trunk/Source/WebKit/mac/WebView/WebView.mm 2016-03-23 23:42:18 UTC (rev 198603)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2016-03-23 23:47:29 UTC (rev 198604)
@@ -2866,16 +2866,6 @@
return declaredKeys;
}
-- (void)setObservationInfo:(void *)info
-{
- _private->observationInfo = info;
-}
-
-- (void *)observationInfo
-{
- return _private->observationInfo;
-}
-
- (void)_willChangeBackForwardKeys
{
[self _willChangeValueForKey: _WebCanGoBackKey];
Modified: trunk/Source/WebKit/mac/WebView/WebViewData.h (198603 => 198604)
--- trunk/Source/WebKit/mac/WebView/WebViewData.h 2016-03-23 23:42:18 UTC (rev 198603)
+++ trunk/Source/WebKit/mac/WebView/WebViewData.h 2016-03-23 23:47:29 UTC (rev 198604)
@@ -210,8 +210,6 @@
WebScriptDebugDelegateImplementationCache scriptDebugDelegateImplementations;
WebHistoryDelegateImplementationCache historyDelegateImplementations;
- void *observationInfo;
-
BOOL closed;
#if PLATFORM(IOS)
BOOL closing;
Modified: trunk/Tools/ChangeLog (198603 => 198604)
--- trunk/Tools/ChangeLog 2016-03-23 23:42:18 UTC (rev 198603)
+++ trunk/Tools/ChangeLog 2016-03-23 23:47:29 UTC (rev 198604)
@@ -1,3 +1,21 @@
+2016-03-23 Anders Carlsson <[email protected]>
+
+ Crash when using KVO from within -[WebView initWithCoder:]
+ https://bugs.webkit.org/show_bug.cgi?id=155816
+ rdar://problem/17073265
+
+ Reviewed by Dan Bernstein.
+
+ Add test.
+
+ * TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
+ * TestWebKitAPI/Tests/mac/EarlyKVOCrash.mm: Added.
+ (-[EarlyKVOCrashResponder initWithWebView:]):
+ (-[EarlyKVOCrashResponder initWithCoder:]):
+ (-[EarlyKVOCrashResponder dealloc]):
+ (-[EarlyKVOCrashResponder encodeWithCoder:]):
+ (TestWebKitAPI::TEST):
+
2016-03-23 Lucas Forschler <[email protected]>
Teach kill-old-processes about perl 5.18.
Modified: trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj (198603 => 198604)
--- trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj 2016-03-23 23:42:18 UTC (rev 198603)
+++ trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj 2016-03-23 23:47:29 UTC (rev 198604)
@@ -21,6 +21,7 @@
1A63479F183D72A4005B1707 /* all-content-in-one-iframe.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = 93D3D19B17B1A7B000C7C415 /* all-content-in-one-iframe.html */; };
1A7E8B3618120B2F00AEB74A /* FragmentNavigation.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = 1A7E8B351812093600AEB74A /* FragmentNavigation.html */; };
1A9E52C913E65EF4006917F5 /* 18-characters.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = C045F9461385C2F800C0F3CD /* 18-characters.html */; };
+ 1A9FB6CE1CA34BE500966124 /* EarlyKVOCrash.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A9FB6CC1CA34BE500966124 /* EarlyKVOCrash.mm */; };
1AAD19F71C7CE20300831E47 /* Coding.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AAD19F51C7CE20300831E47 /* Coding.mm */; };
1ADBEFE3130C6AA100D61D19 /* simple-accelerated-compositing.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = 1ADBEFBC130C6A0100D61D19 /* simple-accelerated-compositing.html */; };
1AEDE22613E5E7E700E62FE8 /* InjectedBundleControllerMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AEDE22413E5E7A000E62FE8 /* InjectedBundleControllerMac.mm */; };
@@ -519,6 +520,7 @@
1A7BFC0A171A0BDB00BC5F64 /* WillSendSubmitEvent.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WillSendSubmitEvent.mm; sourceTree = "<group>"; };
1A7E8B33181208DE00AEB74A /* FragmentNavigation.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = FragmentNavigation.mm; sourceTree = "<group>"; };
1A7E8B351812093600AEB74A /* FragmentNavigation.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = FragmentNavigation.html; sourceTree = "<group>"; };
+ 1A9FB6CC1CA34BE500966124 /* EarlyKVOCrash.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = EarlyKVOCrash.mm; sourceTree = "<group>"; };
1AA9E55714980A9900001A8A /* Functional.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Functional.cpp; sourceTree = "<group>"; };
1AAD19F51C7CE20300831E47 /* Coding.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = Coding.mm; sourceTree = "<group>"; };
1ABC3DED1899BE6D004F0626 /* Navigation.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = Navigation.mm; sourceTree = "<group>"; };
@@ -1441,6 +1443,7 @@
3751AF7A169518F800764319 /* DOMNodeFromJSObject.mm */,
37DC678B140D7C5000ABCCDB /* DOMRangeOfString.mm */,
C07E6CAE13FD67650038B22B /* DynamicDeviceScaleFactor.mm */,
+ 1A9FB6CC1CA34BE500966124 /* EarlyKVOCrash.mm */,
4BB4160316815F9100824238 /* ElementAtPointInWebFrame.mm */,
1A7E8B33181208DE00AEB74A /* FragmentNavigation.mm */,
CDBFCC431A9FF44800A7B691 /* FullscreenZoomInitialFrame.mm */,
@@ -1950,6 +1953,7 @@
51B1EE8E1C80F5880064FB98 /* IndexedDBPersistence.mm in Sources */,
7A5623111AD5AF3E0096B920 /* MenuTypesForMouseEvents.cpp in Sources */,
1AAD19F71C7CE20300831E47 /* Coding.mm in Sources */,
+ 1A9FB6CE1CA34BE500966124 /* EarlyKVOCrash.mm in Sources */,
9B0786A31C58830F00D159E3 /* InjectedBundleMakeAllShadowRootsOpen.cpp in Sources */,
1A4F81CC1BDFFD37004E672E /* RemoteObjectRegistry.mm in Sources */,
51CB4AD81B3A079C00C1B1C6 /* ModalAlertsSPI.cpp in Sources */,
Added: trunk/Tools/TestWebKitAPI/Tests/mac/EarlyKVOCrash.mm (0 => 198604)
--- trunk/Tools/TestWebKitAPI/Tests/mac/EarlyKVOCrash.mm (rev 0)
+++ trunk/Tools/TestWebKitAPI/Tests/mac/EarlyKVOCrash.mm 2016-03-23 23:47:29 UTC (rev 198604)
@@ -0,0 +1,92 @@
+/*
+ * Copyright (C) 2016 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import "config.h"
+
+#import <WebKit/WebView.h>
+#import <wtf/RetainPtr.h>
+
+@interface EarlyKVOCrashResponder : NSResponder {
+ RetainPtr<WebView> _webView;
+}
+
+- (instancetype)initWithWebView:(WebView *)webView;
+
+@end
+
+@implementation EarlyKVOCrashResponder
+
+- (instancetype)initWithWebView:(WebView *)webView
+{
+ if (!(self = [super init]))
+ return nil;
+
+ _webView = webView;
+ [_webView addObserver:self forKeyPath:@"hidden" options:0 context:nullptr];
+
+ return self;
+}
+
+- (instancetype)initWithCoder:(NSCoder *)coder
+{
+ if (!(self = [super initWithCoder:coder]))
+ return nil;
+
+ _webView = [coder decodeObjectForKey:@"webView"];
+ [_webView addObserver:self forKeyPath:@"hidden" options:0 context:nullptr];
+
+ return self;
+}
+
+- (void)dealloc
+{
+ [_webView removeObserver:self forKeyPath:@"hidden" context:nullptr];
+
+ [super dealloc];
+}
+
+- (void)encodeWithCoder:(NSCoder *)coder
+{
+ [super encodeWithCoder:coder];
+
+ [coder encodeObject:_webView.get() forKey:@"webView"];
+}
+
+@end
+
+namespace TestWebKitAPI {
+
+TEST(WebKit1, EarlyKVOCrash)
+{
+ auto webView = adoptNS([[WebView alloc] initWithFrame:NSZeroRect frameName:nil groupName:nil]);
+ auto earlyKVOCrashResponder = adoptNS([[EarlyKVOCrashResponder alloc] initWithWebView:webView.get()]);
+
+ [webView setNextResponder:earlyKVOCrashResponder.get()];
+
+ NSData *data = "" archivedDataWithRootObject:@[ webView.get(), earlyKVOCrashResponder.get() ]];
+ [NSKeyedUnarchiver unarchiveObjectWithData:data];
+}
+
+} // namespace TestWebKitAPI
