From 8864cbf80ad50146757985b6b36a5aaa94aa91ff Mon Sep 17 00:00:00 2001 From: unlnown542a Date: Sun, 7 Jan 2018 00:40:17 +0300 Subject: [PATCH] return to strdup() when filling argv[] for i2p::android::start(argc,argv).c_str() --- android/build.gradle | 2 +- android/jni/i2pd_android.cpp | 15 ++++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index b69967ef..fb2fe8c6 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -23,7 +23,7 @@ android { targetSdkVersion 25 minSdkVersion 14 versionCode 1 - versionName "2.17.2b" + versionName "2.17.2c" } sourceSets { main { diff --git a/android/jni/i2pd_android.cpp b/android/jni/i2pd_android.cpp index b4bfa6e6..ac1e2b70 100755 --- a/android/jni/i2pd_android.cpp +++ b/android/jni/i2pd_android.cpp @@ -46,13 +46,14 @@ JNIEXPORT jstring JNICALL Java_org_purplei2p_i2pd_I2PD_1JNI_getABICompiledWith JNIEXPORT jstring JNICALL Java_org_purplei2p_i2pd_I2PD_1JNI_startDaemon (JNIEnv * env, jclass clazz) { - int argc=5; - static char* argv[]={ - "i2pd", "--service", "--daemon", - "--conf=/sdcard/i2pd/i2pd.conf", - "--tunconf=/sdcard/i2pd/tunnels.conf", - "--datadir=/data/data/org.purplei2p.i2pd/app_data/" - }; + int argc=5; + static char* argv[]={ + strdup("i2pd"), + strdup("--conf=/sdcard/i2pd/i2pd.conf"), + strdup("--tunconf=/sdcard/i2pd/tunnels.conf"), + strdup("--datadir=/data/data/org.purplei2p.i2pd/app_data/"), + strdup("--service"), strdup("--daemon") + }; return env->NewStringUTF(i2p::android::start(argc,argv).c_str()); }