fix wild pointer in xlog(pub_key)

Tencent · Oct 12, 2017 · 3b06da5 · 3b06da5
1 parent f685e74
commit 3b06da5
Show file tree

Hide file tree

Showing 8 changed files with 35 additions and 17 deletions.
diff --git a/README.md b/README.md
@@ -41,7 +41,7 @@ Add dependencies by adding the following lines to your app/build.gradle.
 
 ```xml
 dependencies {
- compile 'com.tencent.mars:mars-wrapper:1.1.7'
+ compile 'com.tencent.mars:mars-wrapper:1.1.8'
 }
 ```
 
@@ -53,11 +53,20 @@ Add dependencies by adding the following lines to your app/build.gradle.
 
 ```xml
 dependencies {
- compile 'com.tencent.mars:mars-core:1.2.0'
+ compile 'com.tencent.mars:mars-core:1.2.1'
+}
+```
+**OR**
+#### <a name="">mars-xlog</a>
+If you just want to user xlog, add dependencies by adding the following lines to your app/build.gradle.
+note: xlog is included in mars-core and mars-wrapper. 
+```xml
+dependencies {
+ compile 'com.tencent.mars:mars-xlog:1.0.6'
 }
 ```
 
-If you read here, make sure you have added dependencies of mars-wrapper or mars-core.
+If you read here, make sure you have added dependencies of mars-wrapper, mars-core or mars-xlog.
 
 #### <a name="Xlog">Xlog Init</a>
 
@@ -414,7 +423,7 @@ gradle 接入我们提供了两种接入方式：[mars-wrapper](#wrapper) 或者
 
 ```xml
 dependencies {
- compile 'com.tencent.mars:mars-wrapper:1.1.7'
+ compile 'com.tencent.mars:mars-wrapper:1.1.8'
 }
 ```
 
@@ -427,10 +436,18 @@ dependencies {
 
 ```xml
 dependencies {
- compile 'com.tencent.mars:mars-core:1.2.0, '
+ compile 'com.tencent.mars:mars-core:1.2.1'
+}
+```
+**或者**
+#### <a name="">mars-xlog</a>
+如果只想使用 xlog,可以只加 xlog 的依赖(mars-core,mars-wrapper 中都已经包括 xlog)：
+```xml
+dependencies {
+ compile 'com.tencent.mars:mars-xlog:1.0.6'
 }
 ```
-接着往下操作之前，请先确保你已经添加了 mars-wrapper 或者 mars-core 的依赖
+接着往下操作之前，请先确保你已经添加了 mars-wrapper 或者 mars-core 或者 mars-xlog 的依赖
 
 #### <a name="Xlog">Xlog Init</a>
 

diff --git a/mars/comm/verinfo.h b/mars/comm/verinfo.h
@@ -2,10 +2,10 @@
 #ifndef Mars_verinfo_h
 #define Mars_verinfo_h
 
-#define MARS_REVISION "053db13"
-#define MARS_PATH "HEAD"
+#define MARS_REVISION "f685e74"
+#define MARS_PATH "master"
 #define MARS_URL ""
-#define MARS_BUILD_TIME "2017-02-15 09:51:04"
-#define MARS_TAG "default"
+#define MARS_BUILD_TIME "2017-10-12 18:37:49"
+#define MARS_TAG "mars_xlog_sdk/mars_libs"
 
 #endif
diff --git a/mars/libraries/mars_android_sdk/gradle.properties b/mars/libraries/mars_android_sdk/gradle.properties
@@ -3,7 +3,7 @@ PROJ_GROUP=com.tencent.mars
 # 库的ID
 PROJ_ARTIFACTID=mars-core
 # 库的版本
-PROJ_VERSION=1.2.0
+PROJ_VERSION=1.2.1
 ### 最后 gradle引用的形式就是 $PROJ_GROUP:$PROJ_ARTIFACTID:$PROJ_VERSION
 
 # 库名

diff --git a/mars/libraries/mars_xlog_sdk/gradle.properties b/mars/libraries/mars_xlog_sdk/gradle.properties
@@ -3,7 +3,7 @@ PROJ_GROUP=com.tencent.mars
 # 库的ID
 PROJ_ARTIFACTID=mars-xlog
 # 库的版本
-PROJ_VERSION=1.0.5
+PROJ_VERSION=1.0.6
 ### 最后 gradle引用的形式就是 $PROJ_GROUP:$PROJ_ARTIFACTID:$PROJ_VERSION
 
 # 库名

diff --git a/mars/log/jni/Java2C_Xlog.cc b/mars/log/jni/Java2C_Xlog.cc
@@ -42,8 +42,9 @@ JNIEXPORT void JNICALL Java_com_tencent_mars_xlog_Xlog_appenderOpen
  }
 
  const char* pubkey = NULL;
+ ScopedJstring jstr_pubkey(env, _pubkey);
  if (NULL != _pubkey) {
- pubkey = ScopedJstring(env, _pubkey).GetChar();
+ pubkey = jstr_pubkey.GetChar();
  }
 
  ScopedJstring log_dir_jstr(env, _log_dir);

diff --git a/samples/android/marsSampleChat/build.gradle b/samples/android/marsSampleChat/build.gradle
@@ -23,9 +23,9 @@ subprojects {
 
 ext {
  GROUP = 'com.tencent.mars.sample'
- VERSION_NAME_PREFIX = '1.2.0'
+ VERSION_NAME_PREFIX = '1.2.1'
  VERSION_NAME_SUFFIX = '' // '-SNAPSHOT'
- WRAPPER_VERSION_NAME_PREFIX = '1.1.7'
+ WRAPPER_VERSION_NAME_PREFIX = '1.1.8'
  WRAPPER_VERSION_NAME_SUFFIX = '' // '-SNAPSHOT'
 
  minSdkVersion = 16

diff --git a/samples/android/marsSampleChat/wrapper/gradle.properties b/samples/android/marsSampleChat/wrapper/gradle.properties
@@ -7,7 +7,7 @@ PROJ_GROUP=com.tencent.mars
 # 库的ID
 PROJ_ARTIFACTID=mars-wrapper
 # 库的版本
-PROJ_VERSION=1.1.7
+PROJ_VERSION=1.1.8
 ### 最后 gradle引用的形式就是 $PROJ_GROUP:$PROJ_ARTIFACTID:$PROJ_VERSION
 
 # 库名

diff --git a/samples/android/xlogSample/build.gradle b/samples/android/xlogSample/build.gradle
@@ -26,7 +26,7 @@ task clean(type: Delete) {
 
 ext {
  GROUP = 'com.tencent.mars'
- VERSION_NAME = '1.0.5'
+ VERSION_NAME = '1.0.6'
  VERSION_NAME_SUFFIX = ''
 }