diff --git a/mozilla/security/jss/org/mozilla/jss/ssl/SSLSocket.c b/mozilla/security/jss/org/mozilla/jss/ssl/SSLSocket.c
index 479de8bc99b..080c84e6d05 100644
--- a/mozilla/security/jss/org/mozilla/jss/ssl/SSLSocket.c
+++ b/mozilla/security/jss/org/mozilla/jss/ssl/SSLSocket.c
@@ -566,9 +566,11 @@ finish:
         PR_Free(cipher);
     }
     if( issuer != NULL ) {
-        PR_Free(issuer);
+        PORT_Free(issuer);
+    }
+    if ( subject != NULL) {
+        PORT_Free(subject);
     }
-    /* subject is not allocated so it doesn't need to be freed */
     if( peerCert != NULL ) {
         CERT_DestroyCertificate(peerCert);
     }