<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[211453] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/211453">211453</a></dd>
<dt>Author</dt> <dd>wenson_hsieh@apple.com</dd>
<dt>Date</dt> <dd>2017-01-31 15:28:22 -0800 (Tue, 31 Jan 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>WebItemProviderPasteboard should be robust when UIItemProvider fails to initialize an object
https://bugs.webkit.org/show_bug.cgi?id=167663
<rdar://problem/30294240>
Reviewed by Tim Horton.
Adds a nil check for the result of -createObjectOfClass:error:.
* platform/ios/WebItemProviderPasteboard.mm:
(-[WebItemProviderPasteboard valuesForPasteboardType:inItemSet:]):
(-[WebItemProviderPasteboard _tryToCreateAndAppendObjectOfClass:toArray:usingProvider:]):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformiosWebItemProviderPasteboardmm">trunk/Source/WebCore/platform/ios/WebItemProviderPasteboard.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (211452 => 211453)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-01-31 23:24:24 UTC (rev 211452)
+++ trunk/Source/WebCore/ChangeLog 2017-01-31 23:28:22 UTC (rev 211453)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2017-01-31 Wenson Hsieh <wenson_hsieh@apple.com>
+
+ WebItemProviderPasteboard should be robust when UIItemProvider fails to initialize an object
+ https://bugs.webkit.org/show_bug.cgi?id=167663
+ <rdar://problem/30294240>
+
+ Reviewed by Tim Horton.
+
+ Adds a nil check for the result of -createObjectOfClass:error:.
+
+ * platform/ios/WebItemProviderPasteboard.mm:
+ (-[WebItemProviderPasteboard valuesForPasteboardType:inItemSet:]):
+ (-[WebItemProviderPasteboard _tryToCreateAndAppendObjectOfClass:toArray:usingProvider:]):
+
</ins><span class="cx"> 2017-01-31 Keith Rollin <krollin@apple.com>
</span><span class="cx">
</span><span class="cx"> Variable used after it's been WTFMove'd
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformiosWebItemProviderPasteboardmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/WebItemProviderPasteboard.mm (211452 => 211453)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/WebItemProviderPasteboard.mm 2017-01-31 23:24:24 UTC (rev 211452)
+++ trunk/Source/WebCore/platform/ios/WebItemProviderPasteboard.mm 2017-01-31 23:28:22 UTC (rev 211453)
</span><span class="lines">@@ -169,30 +169,20 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> // FIXME: These should be refactored to use asynchronous calls.
</span><del>- if (isColorType(pasteboardType) && [provider canCreateObjectOfClass:[getUIColorClass() class]]) {
- [values addObject:[provider createObjectOfClass:[getUIColorClass() class] error:nil]];
</del><ins>+ if (isColorType(pasteboardType) && [self _tryToCreateAndAppendObjectOfClass:[getUIColorClass() class] toArray:values usingProvider:provider])
</ins><span class="cx"> return;
</span><del>- }
</del><span class="cx">
</span><del>- if (isImageType(pasteboardType) && [provider canCreateObjectOfClass:[getUIImageClass() class]]) {
- [values addObject:[provider createObjectOfClass:[getUIImageClass() class] error:nil]];
</del><ins>+ if (isImageType(pasteboardType) && [self _tryToCreateAndAppendObjectOfClass:[NSString class] toArray:values usingProvider:provider])
</ins><span class="cx"> return;
</span><del>- }
</del><span class="cx">
</span><del>- if (isURLType(pasteboardType) && [provider canCreateObjectOfClass:[NSURL class]]) {
- [values addObject:[provider createObjectOfClass:[NSURL class] error:nil]];
</del><ins>+ if (isURLType(pasteboardType) && [self _tryToCreateAndAppendObjectOfClass:[NSURL class] toArray:values usingProvider:provider])
</ins><span class="cx"> return;
</span><del>- }
</del><span class="cx">
</span><del>- if (isRichTextType(pasteboardType) && [provider canCreateObjectOfClass:[NSAttributedString class]]) {
- [values addObject:[provider createObjectOfClass:[NSAttributedString class] error:nil]];
</del><ins>+ if (isRichTextType(pasteboardType) && [self _tryToCreateAndAppendObjectOfClass:[NSAttributedString class] toArray:values usingProvider:provider])
</ins><span class="cx"> return;
</span><del>- }
</del><span class="cx">
</span><del>- if (isStringType(pasteboardType) && [provider canCreateObjectOfClass:[NSString class]]) {
- [values addObject:[provider createObjectOfClass:[NSString class] error:nil]];
</del><ins>+ if (isStringType(pasteboardType) && [self _tryToCreateAndAppendObjectOfClass:[NSString class] toArray:values usingProvider:provider])
</ins><span class="cx"> return;
</span><del>- }
</del><span class="cx">
</span><span class="cx"> WTFLogAlways("Failed to instantiate object for type: '%s' at index: %tu", pasteboardType.UTF8String, index);
</span><span class="cx"> }];
</span><span class="lines">@@ -199,6 +189,18 @@
</span><span class="cx"> return values;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (BOOL)_tryToCreateAndAppendObjectOfClass:(Class)objectClass toArray:(NSMutableArray *)array usingProvider:(UIItemProvider *)provider
+{
+ if (![provider canCreateObjectOfClass:objectClass])
+ return NO;
+
+ id object = [provider createObjectOfClass:objectClass error:nil];
+ if (object)
+ [array addObject:object];
+
+ return !!object;
+}
+
</ins><span class="cx"> - (NSInteger)changeCount
</span><span class="cx"> {
</span><span class="cx"> return _changeCount;
</span></span></pre>
</div>
</div>
</body>
</html>