ConscryptFileDescriptorSocket: Null check SslWrapper object before us…

…ing it (#471)
google · Apr 18, 2018 · e271af4 · e271af4
1 parent e9f6d16
commit e271af4
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/common/src/main/java/org/conscrypt/ConscryptFileDescriptorSocket.java b/common/src/main/java/org/conscrypt/ConscryptFileDescriptorSocket.java
@@ -1081,8 +1081,10 @@ protected final void finalize() throws Throwable {
             if (guard != null) {
                 Platform.closeGuardWarnIfOpen(guard);
             }
-            synchronized (ssl) {
-                transitionTo(STATE_CLOSED);
+            if (ssl != null) {
+                synchronized (ssl) {
+                    transitionTo(STATE_CLOSED);
+                }
             }
         } finally {
             super.finalize();