IosSslSocket: add autoreleasepool to free temporary arrays in the SSL…

… callbacks. Change on 2018/11/26 by antoniocortes <[email protected]> ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=222932038
google · Nov 27, 2018 · 1ff7977 · 1ff7977
1 parent 33d327e
commit 1ff7977
Showing 1 changed file with 31 additions and 27 deletions.
diff --git a/jre_emul/Classes/com/google/j2objc/net/ssl/IosSslSocket.m b/jre_emul/Classes/com/google/j2objc/net/ssl/IosSslSocket.m
@@ -336,42 +336,46 @@ - (jboolean)getEnableSessionCreation {
 @end
 
 static OSStatus SslReadCallback(SSLConnectionRef connection, void *data, size_t *dataLength) {
-  ComGoogleJ2objcNetSslIosSslSocket *socket = (ComGoogleJ2objcNetSslIosSslSocket *) connection;
-  IOSByteArray *array = [IOSByteArray arrayWithLength:*dataLength];
-  jint processed;
-  @try {
-    processed = [[socket plainInputStream] readWithByteArray:array];
-  } @catch (JavaIoIOException *e) {
-    JreStrongAssign(&socket->_sslException, e);
-    return errSSLInternal;
-  }
+  @autoreleasepool {
+    ComGoogleJ2objcNetSslIosSslSocket *socket = (ComGoogleJ2objcNetSslIosSslSocket *) connection;
+    IOSByteArray *array = [IOSByteArray arrayWithLength:*dataLength];
+    jint processed;
+    @try {
+      processed = [[socket plainInputStream] readWithByteArray:array];
+    } @catch (JavaIoIOException *e) {
+      JreStrongAssign(&socket->_sslException, e);
+      return errSSLInternal;
+    }
 
-  if (processed  < 0) {
-    *dataLength = 0;
-    return errSSLClosedGraceful;
-  }
+    if (processed  < 0) {
+      *dataLength = 0;
+      return errSSLClosedGraceful;
+    }
 
-  OSStatus status = processed < *dataLength ? errSSLWouldBlock : errSecSuccess;
-  if (processed > 0) {
-    [array getBytes:(jbyte *)data length:processed];
+    OSStatus status = processed < *dataLength ? errSSLWouldBlock : errSecSuccess;
+    if (processed > 0) {
+      [array getBytes:(jbyte *)data length:processed];
+    }
+    *dataLength = processed;
+    return status;
   }
-  *dataLength = processed;
-  return status;
 }
 
 static OSStatus SslWriteCallback(SSLConnectionRef connection,
                                  const void *data,
                                  size_t *dataLength) {
-  ComGoogleJ2objcNetSslIosSslSocket *socket = (ComGoogleJ2objcNetSslIosSslSocket *) connection;
-  IOSByteArray *array = [IOSByteArray arrayWithBytes:(const jbyte *)data count:*dataLength];
-  @try {
-    [[socket plainOutputStream] writeWithByteArray:array];
-    [[socket plainOutputStream] flush];
-  } @catch (JavaIoIOException *e) {
-    JreStrongAssign(&socket->_sslException, e);
-    return errSSLInternal;
+  @autoreleasepool {
+    ComGoogleJ2objcNetSslIosSslSocket *socket = (ComGoogleJ2objcNetSslIosSslSocket *) connection;
+    IOSByteArray *array = [IOSByteArray arrayWithBytes:(const jbyte *)data count:*dataLength];
+    @try {
+      [[socket plainOutputStream] writeWithByteArray:array];
+      [[socket plainOutputStream] flush];
+    } @catch (JavaIoIOException *e) {
+      JreStrongAssign(&socket->_sslException, e);
+      return errSSLInternal;
+    }
+    return errSecSuccess;
   }
-  return errSecSuccess;
 }
 
 static void checkStatus(OSStatus status) {