Skip to content

Fix crash on HTC One M8 #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ahamilt wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix crash on HTC One M8 #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions src/main/native/natj/CRuntime.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -885,7 +885,7 @@ void processStructureFunctions(JNIEnv* env, jclass type) {
jobject libAnn =
env->CallObjectMethod(type, gGetAnnotationMethod, gLibraryClass);
if (!env->IsSameObject(libAnn, NULL)) {
jobject libName = env->CallObjectMethod(libAnn, gGetLibraryMethod);
jobject libName = env->CallObjectMethod(libAnn, gGetLibraryMethod, nullptr);
env->DeleteLocalRef(libAnn);
jstring libPath = (jstring)env->CallStaticObjectMethod(
gNatJClass, gLookUpLibraryStaticMethod, libName, false);
Expand Down Expand Up @@ -957,7 +957,7 @@ void processStructureFunctions(JNIEnv* env, jclass type) {
if (env->IsSameObject(var, NULL)) {
info->variadic = kNotVariadic;
} else {
info->variadic = env->CallByteMethod(var, gGetVariadicUnboxPolicyMethod);
info->variadic = env->CallByteMethod(var, gGetVariadicUnboxPolicyMethod, nullptr);
if (info->variadic == gRuntimeVariadicPolicyValue) {
info->variadic = gDefaultUnboxPolicy;
} else if (info->variadic == gUnboxVariadicPolicyValue) {
Expand Down Expand Up @@ -1014,7 +1014,7 @@ void processStructureFunctions(JNIEnv* env, jclass type) {

// Get method name
jstring methodName =
(jstring)env->CallObjectMethod(fieldAnn, gGetCFunctionNameMethod);
(jstring)env->CallObjectMethod(fieldAnn, gGetCFunctionNameMethod, nullptr);
if (env->GetStringUTFLength(methodName) == 0) {
methodName =
(jstring)env->CallObjectMethod(method, gGetMethodNameMethod);
Expand Down Expand Up @@ -1145,11 +1145,11 @@ void processStructureFunctions(JNIEnv* env, jclass type) {

// Store whether it is a getter
info->isGetter =
env->CallBooleanMethod(fieldAnn, gGetCVariableIsGetterMethod);
env->CallBooleanMethod(fieldAnn, gGetCVariableIsGetterMethod, nullptr);

// Store the pointer of the variable
jstring variableName =
(jstring)env->CallObjectMethod(fieldAnn, gGetCVariableNameMethod);
(jstring)env->CallObjectMethod(fieldAnn, gGetCVariableNameMethod, nullptr);
if (env->GetStringUTFLength(variableName) == 0) {
variableName =
(jstring)env->CallObjectMethod(method, gGetMethodNameMethod);
Expand Down