summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authormark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-06 22:35:05 +0000
committermark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-06 22:35:05 +0000
commit6a3a28907451350d373a25d896e459ebfa7eda13 (patch)
tree70a960cea630769b45790152ada28b0578c857f0 /net
parent36631e2432c05cde434ac2bd97ab3bbd1995b9e1 (diff)
downloadchromium_src-6a3a28907451350d373a25d896e459ebfa7eda13.zip
chromium_src-6a3a28907451350d373a25d896e459ebfa7eda13.tar.gz
chromium_src-6a3a28907451350d373a25d896e459ebfa7eda13.tar.bz2
Fixes for review comments following r120599.
BUG=112443 Review URL: https://chromiumcodereview.appspot.com/9337007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@120636 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
-rw-r--r--net/base/x509_certificate_mac.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/base/x509_certificate_mac.cc b/net/base/x509_certificate_mac.cc
index d69b87f..d2556d7 100644
--- a/net/base/x509_certificate_mac.cc
+++ b/net/base/x509_certificate_mac.cc
@@ -1148,9 +1148,9 @@ int X509Certificate::VerifyInternal(const std::string& hostname,
if (copy_extended_result) {
CFDictionaryRef ev_dict_temp = NULL;
status = copy_extended_result(trust_ref, &ev_dict_temp);
- base::mac::ScopedCFTypeRef<CFDictionaryRef> ev_dict(ev_dict_temp);
+ ScopedCFTypeRef<CFDictionaryRef> ev_dict(ev_dict_temp);
ev_dict_temp = NULL;
- if (status == noErr) {
+ if (status == noErr && ev_dict) {
// In 10.7.3, SecTrustCopyExtendedResult returns noErr and populates
// ev_dict even for non-EV certificates, but only EV certificates
// will cause ev_dict to contain kSecEVOrganizationName. In previous