Backout changeset de9265797f0a (bug 644070) because of test failures on Mac
authorEhsan Akhgari <ehsan@mozilla.com>
Wed, 23 Mar 2011 20:47:08 -0400
changeset 63704 741701875aec05f17c9e07a1596a7a016a139b5a
parent 63703 5eccdbc70bc771ccde10a02c06dc458b174c99de
child 63705 22a798b4a012bc4a5974e62052981c1f6d844bb0
child 63776 9bc4aefb44dbf7217d4a8c1a993dd8b068b189a0
push id19250
push usereakhgari@mozilla.com
push dateThu, 24 Mar 2011 00:47:16 +0000
treeherdermozilla-central@741701875aec [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs644070
milestone2.2a1pre
backs outde9265797f0a80018c5e2c26470a16fa8155d609
first release with
nightly linux32
741701875aec / 4.2a1pre / 20110324030442 / files
nightly linux64
741701875aec / 4.2a1pre / 20110324030442 / files
nightly mac
741701875aec / 4.2a1pre / 20110324030442 / files
nightly win32
741701875aec / 4.2a1pre / 20110324030442 / files
nightly win64
741701875aec / 4.2a1pre / 20110324030205 / files
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backout changeset de9265797f0a (bug 644070) because of test failures on Mac
security/manager/ssl/src/nsNSSCertificate.cpp
--- a/security/manager/ssl/src/nsNSSCertificate.cpp
+++ b/security/manager/ssl/src/nsNSSCertificate.cpp
@@ -1630,20 +1630,20 @@ char* nsNSSCertificate::defaultServerNic
       nickname = PR_smprintf("%s #%d", servername, count);
     }
     if (nickname == NULL) {
       break;
     }
 
     conflict = SEC_CertNicknameConflict(nickname, &cert->derSubject,
                                         cert->dbhandle);
-    PR_Free(nickname);
     if (!conflict) {
       break;
     }
+    PR_Free(nickname);
     count++;
   }
   PR_FREEIF(servername);
   return nickname;
 }
 
 NS_IMPL_THREADSAFE_ISUPPORTS1(nsNSSCertList, nsIX509CertList)