Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/jni/ArgConverter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,7 @@ std::string ArgConverter::jstringToString(jstring value)
const char* chars = env.GetStringUTFChars(value, &f);
string s(chars);
env.ReleaseStringUTFChars(value, chars);
env.DeleteLocalRef(value);

return s;
}
Expand All @@ -251,6 +252,7 @@ Handle<String> ArgConverter::jcharToV8String(jchar value)
const char* resP = env.GetStringUTFChars(str, &bol);
auto v8String = ConvertToV8String(resP, 1);
env.ReleaseStringUTFChars(str, resP);
env.DeleteLocalRef(str);
return v8String;
}

Expand All @@ -268,7 +270,7 @@ Local<String> ArgConverter::jstringToV8String(jstring value)
jbyte *data = env.GetByteArrayElements(arr, nullptr);
auto v8String = ConvertToV8String((const char *)data, length);
env.ReleaseByteArrayElements(arr, data, JNI_ABORT);

env.DeleteLocalRef(arr);
return v8String;
}

Expand Down
2 changes: 2 additions & 0 deletions src/jni/ArrayElementAccessor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ Handle<Value> ArrayElementAccessor::GetArrayElement(const Handle<Object>& array,
const char* singleChar = env.GetStringUTFChars(s, &isCopy);
value = CheckForArrayAccessException(env, elementSignature, singleChar);
env.ReleaseStringUTFChars(s, singleChar);
env.DeleteLocalRef(s);
}
else if (elementSignature == "S")
{
Expand Down Expand Up @@ -133,6 +134,7 @@ void ArrayElementAccessor::SetArrayElement(const Handle<Object>& array, uint32_t
const char* singleChar = env.GetStringUTFChars(s, &isCopy);
jchar charElementValue = *singleChar;
env.ReleaseStringUTFChars(s, singleChar);
env.DeleteLocalRef(s);
jcharArray charArr = reinterpret_cast<jcharArray>(arr);
env.SetCharArrayRegion(charArr, index, 1, &charElementValue);
}
Expand Down
2 changes: 2 additions & 0 deletions src/jni/ExceptionUtil.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ void ExceptionUtil::GetExceptionMessage(JEnv& env, jthrowable exception, string&
}

env.ReleaseStringUTFChars(msg, msgStr);
env.DeleteLocalRef(msg);
}

for (jsize i = 0; i < framesLength; i++)
Expand All @@ -102,6 +103,7 @@ void ExceptionUtil::GetExceptionMessage(JEnv& env, jthrowable exception, string&
errMsg.append(msgStr);

env.ReleaseStringUTFChars(msg, msgStr);
env.DeleteLocalRef(msg);
}

if (nullptr != (jobjectArray) frames)
Expand Down
1 change: 1 addition & 0 deletions src/jni/FieldAccessor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ Handle<Value> FieldAccessor::GetJavaField(const Handle<Object>& target, FieldCal
jboolean bol = true;
const char* resP = env.GetStringUTFChars(str, &bol);
env.ReleaseStringUTFChars(str, resP);
env.DeleteLocalRef(str);
fieldResult = handleScope.Escape(ConvertToV8String(resP, 1));
break;
}
Expand Down
1 change: 0 additions & 1 deletion src/jni/JEnv.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -393,7 +393,6 @@ void JEnv::ReleaseStringUTFChars(jstring str, const char* utf)
m_env->ReleaseStringUTFChars(str, utf);
}


jint JEnv::Throw(jthrowable obj)
{
return m_env->Throw(obj);
Expand Down
1 change: 1 addition & 0 deletions src/jni/JsArgConverter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -417,6 +417,7 @@ bool JsArgConverter::ConvertJavaScriptArray(JEnv& env, const Handle<Array>& jsAr
const char* singleChar = env.GetStringUTFChars(s, nullptr);
jchar value = *singleChar;
env.ReleaseStringUTFChars(s, singleChar);
env.DeleteLocalRef(s);
env.SetCharArrayRegion((jcharArray)arr, i, 1, &value);
}
break;
Expand Down
2 changes: 2 additions & 0 deletions src/jni/NativeScriptRuntime.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -312,6 +312,7 @@ void NativeScriptRuntime::CallJavaMethod(const Handle<Object>& caller, const str
jboolean bol = true;
const char* resP = env.GetStringUTFChars(str, &bol);
env.ReleaseStringUTFChars(str, resP);
env.DeleteLocalRef(str);
args.GetReturnValue().Set(ConvertToV8String(resP, 1));
break;
}
Expand Down Expand Up @@ -858,6 +859,7 @@ vector<string> NativeScriptRuntime::GetTypeMetadata(const string& name, int inde
const char *pc = env.GetStringUTFChars(s, nullptr);
result.push_back(string(pc));
env.ReleaseStringUTFChars(s, pc);
env.DeleteLocalRef(s);
}

return result;
Expand Down
1 change: 1 addition & 0 deletions src/jni/com_tns_Platform.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,7 @@ extern "C" void Java_com_tns_Platform_runNativeScript(JNIEnv *_env, jobject obj,
auto cmd = ConvertToV8String(code);

env.ReleaseStringUTFChars(appCode, code);
env.DeleteLocalRef(appCode);

DEBUG_WRITE("Compiling script");

Expand Down