[core] release char* to jni after using (#1612)

apache · Oct 2, 2018 · a4efea0 · a4efea0
1 parent 77b00ac
commit a4efea0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/weex_core/Source/android/base/string/string_utils.h b/weex_core/Source/android/base/string/string_utils.h
@@ -64,8 +64,8 @@ static inline std::string jString2Str(JNIEnv *env, const jstring &jstr) {
 static inline std::string jString2StrFast(JNIEnv *env, const jstring &jstr){
   if (jstr == nullptr)
     return std::string("");
-  const char *nativeString = env->GetStringUTFChars(jstr, JNI_FALSE);
-  return std::string(nativeString);
+  auto nativeString = ScopedJStringUTF8(env, jstr);
+  return std::string(nativeString.getChars());
 }
 
 static std::string jByteArray2Str(JNIEnv *env, jbyteArray barr) {

diff --git a/weex_core/Source/android/wrap/wx_bridge.cpp b/weex_core/Source/android/wrap/wx_bridge.cpp
@@ -170,10 +170,13 @@ static jlongArray GetRenderFinishTime(JNIEnv* env, jobject jcaller,
 
 // Notice that this method is invoked from main thread.
 static jboolean NotifyLayout(JNIEnv* env, jobject jcaller, jstring instanceId) {
-  return WeexCoreManager::Instance()
-      ->getPlatformBridge()
-      ->core_side()
-      ->NotifyLayout(jString2StrFast(env, instanceId));
+  if (WeexCoreManager::Instance()->getPlatformBridge()) {
+    return WeexCoreManager::Instance()
+        ->getPlatformBridge()
+        ->core_side()
+        ->NotifyLayout(jString2StrFast(env, instanceId));
+  }
+  return false;
 }
 
 // Notice that this method is invoked from JS thread.