Changeset 228580 in webkit

Timestamp:

Feb 16, 2018 1:56:16 PM (6 years ago)

Author:

Brent Fulgham

Message:

[Cocoa][WebKitLegacy] REGRESSION(r221559): Coda 2 crashes when switching views
​https://bugs.webkit.org/show_bug.cgi?id=182882
<rdar://problem/35672661>

Reviewed by Dan Bernstein.

Make sure the smart pointer hold the collection of subviews lives at least as
long as the loop using it.

• WebView/WebHTMLView.mm:

(-[WebHTMLView _web_makePluginSubviewsPerformSelector:withObject:]):

Location:

trunk/Source/WebKitLegacy/mac

Files:

• ChangeLog (modified) (1 diff)
• WebView/WebHTMLView.mm (modified) (2 diffs)

trunk/Source/WebKitLegacy/mac/ChangeLog

@@ +1 @@
+2018-02-16  Brent Fulgham  <bfulgham@apple.com>
+
+        [Cocoa][WebKitLegacy] REGRESSION(r221559): Coda 2 crashes when switching views
+        https://bugs.webkit.org/show_bug.cgi?id=182882
+        <rdar://problem/35672661>
+
+        Reviewed by Dan Bernstein.
+
+        Make sure the smart pointer hold the collection of subviews lives at least as
+        long as the loop using it.
+
+        * WebView/WebHTMLView.mm:
+        (-[WebHTMLView _web_makePluginSubviewsPerformSelector:withObject:]):
+
 2018-02-14  Daniel Bates  <dabates@apple.com>
 

trunk/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm

@@ -1 +1 @@
 /*
- * Copyright (C) 2005-2017 Apple Inc. All rights reserved.
+ * Copyright (C) 2005-2018 Apple Inc. All rights reserved.
  *           (C) 2006, 2007 Graham Dennis (graham.dennis@gmail.com)
  *
@@ -1428 +1428 @@
     // Copy subviews because [self subviews] returns the view's mutable internal array,
     // and we must avoid mutating the array while enumerating it.
-    for (NSView *view in adoptNS([[self subviews] copy]).get()) {
+    auto subviewsCopy = adoptNS([self.subviews copy]);
+    for (NSView *view in subviewsCopy.get()) {
         if ([view isKindOfClass:[WebBaseNetscapePluginView class]])
             [view performSelector:selector withObject:object];