libadblockplus-android/jni/JniLogSystem.cpp - Issue 29397600: Issue 5031 - Avoid double deletion of C++ objects

Keyboard Shortcuts

	File
u :	up to issue
m :	publish + mail comments
M :	edit review message
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line
<Enter> :	respond to / edit current comment
d :	mark current comment as done

	Issue
u :	up to list of issues
m :	publish + mail comments
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue
# :	close issue

	Comment/message editing
<Ctrl> + s or <Ctrl> + Enter :	save comment
<Esc> :	cancel edit

Unified Diff: libadblockplus-android/jni/JniLogSystem.cpp

Issue 29397600: Issue 5031 - Avoid double deletion of C++ objects (Closed)

Patch Set: Created March 29, 2017, 11:02 a.m.

Use n/p to move between diff chunks; N/P to move between comments.

Jump to:

Index: libadblockplus-android/jni/JniLogSystem.cpp

diff --git a/libadblockplus-android/jni/JniLogSystem.cpp b/libadblockplus-android/jni/JniLogSystem.cpp

index d537a685bdc7dd7dc7fb10d64efcbed65aa3a5df..6f78e33a6e3a611308b4a06aea6a0dbc8814d5af 100644

--- a/libadblockplus-android/jni/JniLogSystem.cpp

+++ b/libadblockplus-android/jni/JniLogSystem.cpp

@@ -39,14 +39,14 @@ static jlong JNICALL JniCtor(JNIEnv* env, jclass clazz, jobject callbackObject)

{

try

{

- return JniPtrToLong(new JniLogSystemCallback(env, callbackObject));

+ return JniPtrToLong(new JniLogSystemCallbackPtr(new JniLogSystemCallback(env, callbackObject)));

}

CATCH_THROW_AND_RETURN(env, 0)

}

static void JNICALL JniDtor(JNIEnv* env, jclass clazz, jlong ptr)

{

- delete JniLongToTypePtr<JniLogSystemCallback>(ptr);

+ delete JniLongToTypePtr<JniLogSystemCallbackPtr>(ptr);

}

JniLogSystemCallback::JniLogSystemCallback(JNIEnv* env, jobject callbackObject)