Title: [229490] trunk/Source/WebKit
- Revision
- 229490
- Author
- [email protected]
- Date
- 2018-03-09 16:12:35 -0800 (Fri, 09 Mar 2018)
Log Message
Don't pass NULL to the result parameter of SecTrustEvaluate()
https://bugs.webkit.org/show_bug.cgi?id=183495
<rdar://problem/38185688>
Reviewed by Andy Estes.
* UIProcess/ios/WKFullScreenWindowControllerIOS.mm:
(-[WKFullScreenWindowController _EVOrganizationName]):
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (229489 => 229490)
--- trunk/Source/WebKit/ChangeLog 2018-03-09 23:45:11 UTC (rev 229489)
+++ trunk/Source/WebKit/ChangeLog 2018-03-10 00:12:35 UTC (rev 229490)
@@ -1,3 +1,14 @@
+2018-03-09 Jer Noble <[email protected]>
+
+ Don't pass NULL to the result parameter of SecTrustEvaluate()
+ https://bugs.webkit.org/show_bug.cgi?id=183495
+ <rdar://problem/38185688>
+
+ Reviewed by Andy Estes.
+
+ * UIProcess/ios/WKFullScreenWindowControllerIOS.mm:
+ (-[WKFullScreenWindowController _EVOrganizationName]):
+
2018-03-09 Dean Jackson <[email protected]>
Allow NavigationState to intercept requests and send them to SystemPreviewController
Modified: trunk/Source/WebKit/UIProcess/ios/WKFullScreenWindowControllerIOS.mm (229489 => 229490)
--- trunk/Source/WebKit/UIProcess/ios/WKFullScreenWindowControllerIOS.mm 2018-03-09 23:45:11 UTC (rev 229489)
+++ trunk/Source/WebKit/UIProcess/ios/WKFullScreenWindowControllerIOS.mm 2018-03-10 00:12:35 UTC (rev 229490)
@@ -573,11 +573,9 @@
// If SecTrustCopyInfo returned NULL then it's likely that the SecTrustRef has not been evaluated
// and the only way to get the information we need is to call SecTrustEvaluate ourselves.
if (!infoDictionary) {
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wnonnull"
- OSStatus err = SecTrustEvaluate(trust, NULL);
-#pragma clang diagnostic pop
- if (err == noErr)
+ SecTrustResultType result = kSecTrustResultProceed;
+ OSStatus err = SecTrustEvaluate(trust, &result);
+ if (err == noErr && result == kSecTrustResultProceed)
infoDictionary = [(__bridge NSDictionary *)SecTrustCopyInfo(trust) autorelease];
if (!infoDictionary)
return nil;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
