diff options
author | Christian Strømme <christian.stromme@digia.com> | 2014-08-05 19:28:21 +0200 |
---|---|---|
committer | Christian Stromme <christian.stromme@digia.com> | 2014-08-06 17:16:22 +0200 |
commit | 682976def705a094c30a181e129b11c613c8a451 (patch) | |
tree | dce50dc207d3ed531cf1727f76879bebea38c3d3 | |
parent | 2ad9e69a9f9231b5f65a53036ae60bb0abc93609 (diff) |
Android: Fix recursion bug in callStaticMethod()
calling callStaticMethod() with template type jlong, jdouble or
jboolean would cause the call to loop indefinitely.
Change-Id: I99caa576e761fdef623ece04e0779e4cf2535592
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
-rw-r--r-- | src/corelib/kernel/qjni.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/corelib/kernel/qjni.cpp b/src/corelib/kernel/qjni.cpp index aa9b196e62..4581b70ca7 100644 --- a/src/corelib/kernel/qjni.cpp +++ b/src/corelib/kernel/qjni.cpp @@ -721,7 +721,7 @@ jboolean QJNIObjectPrivate::callStaticMethod<jboolean>(jclass clazz, { va_list args; va_start(args, sig); - jboolean res = callStaticMethod<jboolean>(clazz, methodName, sig); + jboolean res = callStaticMethod<jboolean>(clazz, methodName, sig, args); va_end(args); return res; } @@ -1026,7 +1026,7 @@ jlong QJNIObjectPrivate::callStaticMethod<jlong>(jclass clazz, { va_list args; va_start(args, sig); - jlong res = callStaticMethod<jlong>(clazz, methodName, sig); + jlong res = callStaticMethod<jlong>(clazz, methodName, sig, args); va_end(args); return res; } @@ -1119,7 +1119,7 @@ jdouble QJNIObjectPrivate::callStaticMethod<jdouble>(const char *className, { va_list args; va_start(args, sig); - jdouble res = callStaticMethod<jdouble>(className, methodName, sig); + jdouble res = callStaticMethod<jdouble>(className, methodName, sig, args); va_end(args); return res; } |