Add finalizer for x509_Revoked

common/src/jni/main/cpp/conscrypt/native_crypto.cc

@@ -6019,6 +6019,21 @@ static jlong NativeCrypto_X509_REVOKED_dup(JNIEnv* env, jclass, jlong x509Revoke
     return reinterpret_cast<uintptr_t>(dup);
 }
 
+static void NativeCrypto_X509_REVOKED_free(JNIEnv* env, jclass, jlong x509RevokedRef) {
+    CHECK_ERROR_QUEUE_ON_RETURN;
+    X509_REVOKED* revoked = reinterpret_cast<X509_REVOKED*>(static_cast<uintptr_t>(x509RevokedRef));
+    JNI_TRACE("X509_REVOKED_free(%p)", revoked);
+
+    if (revoked == nullptr) {
+        conscrypt::jniutil::throwNullPointerException(env, "revoked == null");
+        JNI_TRACE("X509_REVOKED_free(%p) => revoked == null", revoked);
+        return;
+    }
+
+    X509_REVOKED_free(revoked);
+    revoked = nullptr;
+}
+
 static jlong NativeCrypto_get_X509_REVOKED_revocationDate(JNIEnv* env, jclass,
                                                           jlong x509RevokedRef) {
     CHECK_ERROR_QUEUE_ON_RETURN;
@@ -11849,6 +11864,7 @@ static JNINativeMethod sNativeCryptoMethods[] = {
         CONSCRYPT_NATIVE_METHOD(X509_CRL_get_ext, "(J" REF_X509_CRL "Ljava/lang/String;)J"),
         CONSCRYPT_NATIVE_METHOD(X509_REVOKED_get_ext, "(JLjava/lang/String;)J"),
         CONSCRYPT_NATIVE_METHOD(X509_REVOKED_dup, "(J)J"),
+        CONSCRYPT_NATIVE_METHOD(X509_REVOKED_free, "(J)V"),
         CONSCRYPT_NATIVE_METHOD(i2d_X509_REVOKED, "(J)[B"),
         CONSCRYPT_NATIVE_METHOD(X509_supported_extension, "(J)I"),
         CONSCRYPT_NATIVE_METHOD(ASN1_TIME_to_Calendar, "(JLjava/util/Calendar;)V"),

common/src/main/java/org/conscrypt/NativeCrypto.java

@@ -760,6 +760,8 @@ static native long X509_CRL_get_nextUpdate(long x509CrlCtx, OpenSSLX509CRL holde
 
     @FastNative static native void X509_REVOKED_print(long bioRef, long x509RevokedCtx);
 
+    @FastNative static native void X509_REVOKED_free(long x509RevokedCtx);
+
     // --- X509_EXTENSION ------------------------------------------------------
 
     @FastNative static native int X509_supported_extension(long x509ExtensionRef);

common/src/main/java/org/conscrypt/OpenSSLX509CRLEntry.java

@@ -16,6 +16,8 @@
 
 package org.conscrypt;
 
+import org.conscrypt.OpenSSLX509CertificateFactory.ParsingException;
+
 import java.io.ByteArrayOutputStream;
 import java.math.BigInteger;
 import java.security.cert.CRLException;
@@ -24,12 +26,11 @@
 import java.util.Date;
 import java.util.HashSet;
 import java.util.Set;
-import org.conscrypt.OpenSSLX509CertificateFactory.ParsingException;
 
 /**
  * An implementation of {@link X509CRLEntry} based on BoringSSL.
  */
-final class OpenSSLX509CRLEntry extends X509CRLEntry {
+final class OpenSSLX509CRLEntry extends X509CRLEntry implements AutoCloseable {
     private final long mContext;
     private final Date revocationDate;
 
@@ -135,4 +136,21 @@ public String toString() {
             NativeCrypto.BIO_free_all(bioCtx);
         }
     }
+
+    @Override
+    public void close() {
+        if (mContext != 0) {
+            NativeCrypto.X509_REVOKED_free(mContext);
+        }
+    }
+
+    @Override
+    @SuppressWarnings("Finalize")
+    protected void finalize() throws Throwable {
+        try {
+            close();
+        } finally {
+            super.finalize();
+        }
+    }
 }