mirrors
/
olm
mirror of https://git.matrix.org/git/olm.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix a potential memory leak.

release-v2.2.0
ylecollen 2016-12-21 15:17:53 +01:00
parent 643165067f
commit ffb40326ff
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_jni_helper.cpp
View File

@ -130,8 +130,8 @@ bool setRandomInBuffer(JNIEnv *env, uint8_t **aBuffer2Ptr, size_t aRandomSize)
jlong getInstanceId(JNIEnv* aJniEnv, jobject aJavaObject, const char *aCallingClass) jlong getInstanceId(JNIEnv* aJniEnv, jobject aJavaObject, const char *aCallingClass)
{ {
jlong instanceId = 0; jlong instanceId = 0;
jfieldID instanceIdField; jfieldID instanceIdField = 0;
jclass loaderClass; jclass loaderClass = 0;
jclass requiredClass = 0; jclass requiredClass = 0;
if(NULL!=aJniEnv) if(NULL!=aJniEnv)
@ -147,7 +147,6 @@ jlong getInstanceId(JNIEnv* aJniEnv, jobject aJavaObject, const char *aCallingCl
if(0 != (instanceIdField=aJniEnv->GetFieldID(loaderClass, "mNativeId", "J"))) if(0 != (instanceIdField=aJniEnv->GetFieldID(loaderClass, "mNativeId", "J")))
{ {
instanceId = aJniEnv->GetLongField(aJavaObject, instanceIdField); instanceId = aJniEnv->GetLongField(aJavaObject, instanceIdField);
aJniEnv->DeleteLocalRef(loaderClass);
LOGD("## getInstanceId(): read from java instanceId=%lld",instanceId); LOGD("## getInstanceId(): read from java instanceId=%lld",instanceId);
} }
else else
@ -164,7 +163,14 @@ jlong getInstanceId(JNIEnv* aJniEnv, jobject aJavaObject, const char *aCallingCl
{ {
LOGE("## getInstanceId() ERROR! aJniEnv=NULL"); LOGE("## getInstanceId() ERROR! aJniEnv=NULL");
} }
LOGD("## getInstanceId() success - instanceId=%p (jlong)(intptr_t)instanceId=%lld",(void*)instanceId, (jlong)(intptr_t)instanceId); LOGD("## getInstanceId() success - instanceId=%p (jlong)(intptr_t)instanceId=%lld",(void*)instanceId, (jlong)(intptr_t)instanceId);
if (loaderClass)
{
aJniEnv->DeleteLocalRef(loaderClass);
}
return instanceId; return instanceId;
} }