WolfSSL
/
wolfssljni
mirror of https://github.com/wolfSSL/wolfssljni.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #70 from JacobBarthelmeh/memory 

use '0' when releasing array
pull/71/head
Chris Conlon 2021-10-04 11:54:57 -06:00 committed by GitHub
parent fef868590f ebfe3239f0
commit 4f60a888d8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
native/com_wolfssl_WolfSSLSession.c
View File

@ -611,6 +611,8 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSLSession_write(JNIEnv* jenv,
/* get session mutex from SSL app data */ /* get session mutex from SSL app data */
jniSessLock = (wolfSSL_Mutex*)wolfSSL_get_app_data(ssl); jniSessLock = (wolfSSL_Mutex*)wolfSSL_get_app_data(ssl);
if (jniSessLock == NULL) { if (jniSessLock == NULL) {
(*jenv)->ReleaseByteArrayElements(jenv, raw, (jbyte*)data,
JNI_ABORT);
return SSL_FAILURE; return SSL_FAILURE;
} }
@ -688,6 +690,8 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSLSession_read(JNIEnv* jenv,
/* get session mutex from SSL app data */ /* get session mutex from SSL app data */
jniSessLock = (wolfSSL_Mutex*)wolfSSL_get_app_data(ssl); jniSessLock = (wolfSSL_Mutex*)wolfSSL_get_app_data(ssl);
if (jniSessLock == NULL) { if (jniSessLock == NULL) {
(*jenv)->ReleaseByteArrayElements(jenv, raw, (jbyte*)data,
JNI_ABORT);
return WOLFSSL_FAILURE; return WOLFSSL_FAILURE;
} }
@ -730,7 +734,9 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSLSession_read(JNIEnv* jenv,
} while (err == SSL_ERROR_WANT_WRITE || err == SSL_ERROR_WANT_READ); } while (err == SSL_ERROR_WANT_WRITE || err == SSL_ERROR_WANT_READ);
(*jenv)->ReleaseByteArrayElements(jenv, raw, (jbyte*)data, JNI_COMMIT); /* JNI_COMMIT commits the data but does not free the local array
* 0 is used here to both commit and free */
(*jenv)->ReleaseByteArrayElements(jenv, raw, (jbyte*)data, 0);
} }
return size; return size;