Fix tls_ctx memleak in s3 client creation (#824)

Co-authored-by: Paul Praet <3198728+praetp@users.noreply.github.com>
awslabs · Aug 23, 2024 · c66582f · c66582f
1 parent 9861cd7
commit c66582f
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 5 deletions.
diff --git a/crt/aws-c-compression b/crt/aws-c-compression
diff --git a/crt/s2n b/crt/s2n
diff --git a/src/native/s3_client.c b/src/native/s3_client.c
@@ -521,7 +521,9 @@ JNIEXPORT jlong JNICALL Java_software_amazon_awssdk_crt_s3_S3Client_s3ClientNew(
         env, &proxy_options, jni_proxy_host, jni_proxy_authorization_username, jni_proxy_authorization_password);
 
     aws_mem_release(aws_jni_get_allocator(), s3_tcp_keep_alive_options);
-
+    if (tls_options) {
+        aws_tls_connection_options_clean_up(tls_options);
+    }
     return (jlong)client;
 }
 

diff --git a/src/test/java/software/amazon/awssdk/crt/test/S3ClientTest.java b/src/test/java/software/amazon/awssdk/crt/test/S3ClientTest.java
@@ -126,6 +126,21 @@ public void testS3ClientCreateDestroy() {
 
         }
     }
+
+    @Test
+    public void testS3ClientCreateDestroyWithTLS() {
+        skipIfAndroid();
+        skipIfNetworkUnavailable();
+
+        try (TlsContextOptions tlsContextOptions = TlsContextOptions.createDefaultClient();
+                TlsContext tlsContext = new TlsContext(tlsContextOptions);) {
+            S3ClientOptions clientOptions = new S3ClientOptions()
+                    .withRegion(REGION)
+                    .withTlsContext(tlsContext);
+            try (S3Client client = createS3Client(clientOptions)) {
+            }
+        }
+    }
 
     @Test
     public void testS3ClientCreateDestroyWithCredentialsProvider() {
@@ -260,8 +275,9 @@ public void testS3ClientCreateDestroyHttpProxyOptions() {
             proxyOptions.setAuthorizationType(HttpProxyOptions.HttpProxyAuthorizationType.Basic);
             proxyOptions.setAuthorizationUsername("username");
             proxyOptions.setAuthorizationPassword("password");
-            try (S3Client client = createS3Client(new S3ClientOptions().withRegion(REGION)
-                    .withProxyOptions(proxyOptions), elg)) {
+            try (S3Client client = createS3Client(new S3ClientOptions()
+                        .withRegion(REGION)
+                        .withProxyOptions(proxyOptions), elg)) {
             }
         }
     }
+12 −3		.github/workflows/ci.yml
+4 −6		.github/workflows/clang-format.yml
+47 −0		format-check.py
+0 −24		format-check.sh
+1 −1		source/compression.c