Merge branch 'master' into X25519-alias-1

google · Aug 15, 2023 · 36917f3 · 36917f3
2 parents 4e7a406 + d0f60fe
commit 36917f3
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/android/build.gradle b/android/build.gradle
@@ -57,7 +57,8 @@ if (androidSdkInstalled) {
                 cmake {
                     arguments '-DANDROID=True',
                             '-DANDROID_STL=c++_static',
-                            "-DBORINGSSL_HOME=$boringsslHome"
+                            "-DBORINGSSL_HOME=$boringsslHome",
+                            "-DCMAKE_CXX_STANDARD=17"
                     cFlags '-fvisibility=hidden',
                             '-DBORINGSSL_SHARED_LIBRARY',
                             '-DBORINGSSL_IMPLEMENTATION',

diff --git a/common/src/main/java/org/conscrypt/ConscryptEngine.java b/common/src/main/java/org/conscrypt/ConscryptEngine.java
@@ -1681,7 +1681,13 @@ private void closeAndFreeResources() {
     @SuppressWarnings("deprecation")
     protected void finalize() throws Throwable {
         try {
-            closeAndFreeResources();
+            // If ssl is null, object must not be fully constructed so nothing for us to do here.
+            if (ssl != null) {
+                // Otherwise closeAndFreeResources() and callees expect to synchronize on ssl.
+                synchronized (ssl) {
+                    closeAndFreeResources();
+                }
+            }
         } finally {
             super.finalize();
         }