Title: [261516] branches/safari-609-branch/Source/WebKitLegacy/mac
- Revision
- 261516
- Author
- [email protected]
- Date
- 2020-05-11 17:21:42 -0700 (Mon, 11 May 2020)
Log Message
Cherry-pick r260315. rdar://problem/62978882
-[WebPreferences initWithCoder:] should use -[NSCoder decodeValueOfObjCType:at:size:]
<https://webkit.org/b/210621>
<rdar://problem/61906458>
Reviewed by Anders Carlsson.
* WebView/WebPreferences.mm:
(-[WebPreferences initWithCoder:]):
- Switch to -[NSCoder decodeValueOfObjCType:at:size:].
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@260315 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-609-branch/Source/WebKitLegacy/mac/ChangeLog (261515 => 261516)
--- branches/safari-609-branch/Source/WebKitLegacy/mac/ChangeLog 2020-05-12 00:21:39 UTC (rev 261515)
+++ branches/safari-609-branch/Source/WebKitLegacy/mac/ChangeLog 2020-05-12 00:21:42 UTC (rev 261516)
@@ -1,3 +1,32 @@
+2020-05-07 Russell Epstein <[email protected]>
+
+ Cherry-pick r260315. rdar://problem/62978882
+
+ -[WebPreferences initWithCoder:] should use -[NSCoder decodeValueOfObjCType:at:size:]
+ <https://webkit.org/b/210621>
+ <rdar://problem/61906458>
+
+ Reviewed by Anders Carlsson.
+
+ * WebView/WebPreferences.mm:
+ (-[WebPreferences initWithCoder:]):
+ - Switch to -[NSCoder decodeValueOfObjCType:at:size:].
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@260315 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2020-04-18 David Kilzer <[email protected]>
+
+ -[WebPreferences initWithCoder:] should use -[NSCoder decodeValueOfObjCType:at:size:]
+ <https://webkit.org/b/210621>
+ <rdar://problem/61906458>
+
+ Reviewed by Anders Carlsson.
+
+ * WebView/WebPreferences.mm:
+ (-[WebPreferences initWithCoder:]):
+ - Switch to -[NSCoder decodeValueOfObjCType:at:size:].
+
2020-02-18 Alan Coon <[email protected]>
Cherry-pick r256191. rdar://problem/59447003
Modified: branches/safari-609-branch/Source/WebKitLegacy/mac/WebView/WebPreferences.mm (261515 => 261516)
--- branches/safari-609-branch/Source/WebKitLegacy/mac/WebView/WebPreferences.mm 2020-05-12 00:21:39 UTC (rev 261515)
+++ branches/safari-609-branch/Source/WebKitLegacy/mac/WebView/WebPreferences.mm 2020-05-12 00:21:42 UTC (rev 261516)
@@ -300,7 +300,7 @@
values = [decoder decodeObjectForKey:@"Values"];
} else {
int version;
- [decoder decodeValueOfObjCType:@encode(int) at:&version];
+ [decoder decodeValueOfObjCType:@encode(int) at:&version size:sizeof(int)];
if (version == 1) {
identifier = [decoder decodeObject];
values = [decoder decodeObject];
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
