Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
matrix-org
Olm
Commits
ffb40326
Commit
ffb40326
authored
Dec 21, 2016
by
ylecollen
Browse files
Fix a potential memory leak.
parent
64316506
Changes
1
Hide whitespace changes
Inline
Side-by-side
java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_jni_helper.cpp
View file @
ffb40326
...
...
@@ -130,8 +130,8 @@ bool setRandomInBuffer(JNIEnv *env, uint8_t **aBuffer2Ptr, size_t aRandomSize)
jlong
getInstanceId
(
JNIEnv
*
aJniEnv
,
jobject
aJavaObject
,
const
char
*
aCallingClass
)
{
jlong
instanceId
=
0
;
jfieldID
instanceIdField
;
jclass
loaderClass
;
jfieldID
instanceIdField
=
0
;
jclass
loaderClass
=
0
;
jclass
requiredClass
=
0
;
if
(
NULL
!=
aJniEnv
)
...
...
@@ -147,7 +147,6 @@ jlong getInstanceId(JNIEnv* aJniEnv, jobject aJavaObject, const char *aCallingCl
if
(
0
!=
(
instanceIdField
=
aJniEnv
->
GetFieldID
(
loaderClass
,
"mNativeId"
,
"J"
)))
{
instanceId
=
aJniEnv
->
GetLongField
(
aJavaObject
,
instanceIdField
);
aJniEnv
->
DeleteLocalRef
(
loaderClass
);
LOGD
(
"## getInstanceId(): read from java instanceId=%lld"
,
instanceId
);
}
else
...
...
@@ -164,7 +163,14 @@ jlong getInstanceId(JNIEnv* aJniEnv, jobject aJavaObject, const char *aCallingCl
{
LOGE
(
"## getInstanceId() ERROR! aJniEnv=NULL"
);
}
LOGD
(
"## getInstanceId() success - instanceId=%p (jlong)(intptr_t)instanceId=%lld"
,(
void
*
)
instanceId
,
(
jlong
)(
intptr_t
)
instanceId
);
if
(
loaderClass
)
{
aJniEnv
->
DeleteLocalRef
(
loaderClass
);
}
return
instanceId
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment