Commit cd5c74e0 authored by Jacob Potter's avatar Jacob Potter

More asserts

parent 3ccbc162
...@@ -152,6 +152,7 @@ void jniThrowAssertionError(JNIEnv * env, const char * file, int line, const cha ...@@ -152,6 +152,7 @@ void jniThrowAssertionError(JNIEnv * env, const char * file, int line, const cha
GlobalRef<jclass> jniFindClass(const char * name) { GlobalRef<jclass> jniFindClass(const char * name) {
JNIEnv * env = jniGetThreadEnv(); JNIEnv * env = jniGetThreadEnv();
DJINNI_ASSERT(name, env);
GlobalRef<jclass> guard(env, env->FindClass(name)); GlobalRef<jclass> guard(env, env->FindClass(name));
jniExceptionCheck(env); jniExceptionCheck(env);
if (!guard) { if (!guard) {
...@@ -162,6 +163,9 @@ GlobalRef<jclass> jniFindClass(const char * name) { ...@@ -162,6 +163,9 @@ GlobalRef<jclass> jniFindClass(const char * name) {
jmethodID jniGetStaticMethodID(jclass clazz, const char * name, const char * sig) { jmethodID jniGetStaticMethodID(jclass clazz, const char * name, const char * sig) {
JNIEnv * env = jniGetThreadEnv(); JNIEnv * env = jniGetThreadEnv();
DJINNI_ASSERT(clazz, env);
DJINNI_ASSERT(name, env);
DJINNI_ASSERT(sig, env);
jmethodID id = env->GetStaticMethodID(clazz, name, sig); jmethodID id = env->GetStaticMethodID(clazz, name, sig);
jniExceptionCheck(env); jniExceptionCheck(env);
if (!id) { if (!id) {
...@@ -172,6 +176,9 @@ jmethodID jniGetStaticMethodID(jclass clazz, const char * name, const char * sig ...@@ -172,6 +176,9 @@ jmethodID jniGetStaticMethodID(jclass clazz, const char * name, const char * sig
jmethodID jniGetMethodID(jclass clazz, const char * name, const char * sig) { jmethodID jniGetMethodID(jclass clazz, const char * name, const char * sig) {
JNIEnv * env = jniGetThreadEnv(); JNIEnv * env = jniGetThreadEnv();
DJINNI_ASSERT(clazz, env);
DJINNI_ASSERT(name, env);
DJINNI_ASSERT(sig, env);
jmethodID id = env->GetMethodID(clazz, name, sig); jmethodID id = env->GetMethodID(clazz, name, sig);
jniExceptionCheck(env); jniExceptionCheck(env);
if (!id) { if (!id) {
...@@ -182,6 +189,9 @@ jmethodID jniGetMethodID(jclass clazz, const char * name, const char * sig) { ...@@ -182,6 +189,9 @@ jmethodID jniGetMethodID(jclass clazz, const char * name, const char * sig) {
jfieldID jniGetFieldID(jclass clazz, const char * name, const char * sig) { jfieldID jniGetFieldID(jclass clazz, const char * name, const char * sig) {
JNIEnv * env = jniGetThreadEnv(); JNIEnv * env = jniGetThreadEnv();
DJINNI_ASSERT(clazz, env);
DJINNI_ASSERT(name, env);
DJINNI_ASSERT(sig, env);
jfieldID id = env->GetFieldID(clazz, name, sig); jfieldID id = env->GetFieldID(clazz, name, sig);
jniExceptionCheck(env); jniExceptionCheck(env);
if (!id) { if (!id) {
...@@ -197,6 +207,7 @@ JniEnum::JniEnum(const std::string & name) ...@@ -197,6 +207,7 @@ JniEnum::JniEnum(const std::string & name)
{} {}
jint JniEnum::ordinal(JNIEnv * env, jobject obj) const { jint JniEnum::ordinal(JNIEnv * env, jobject obj) const {
DJINNI_ASSERT(obj, env);
const jint res = env->CallIntMethod(obj, m_methOrdinal); const jint res = env->CallIntMethod(obj, m_methOrdinal);
jniExceptionCheck(env); jniExceptionCheck(env);
return res; return res;
...@@ -222,6 +233,7 @@ JniLocalScope::~JniLocalScope() { ...@@ -222,6 +233,7 @@ JniLocalScope::~JniLocalScope() {
} }
bool JniLocalScope::_pushLocalFrame(JNIEnv* const env, jint capacity) { bool JniLocalScope::_pushLocalFrame(JNIEnv* const env, jint capacity) {
DJINNI_ASSERT(capacity >= 0, env);
const jint push_res = env->PushLocalFrame(capacity); const jint push_res = env->PushLocalFrame(capacity);
return 0 == push_res; return 0 == push_res;
} }
...@@ -388,6 +400,7 @@ static void utf8_encode(char32_t pt, std::string & out) { ...@@ -388,6 +400,7 @@ static void utf8_encode(char32_t pt, std::string & out) {
} }
std::string jniUTF8FromString(JNIEnv * env, const jstring jstr) { std::string jniUTF8FromString(JNIEnv * env, const jstring jstr) {
DJINNI_ASSERT(jstr, env);
const jsize length = env->GetStringLength(jstr); const jsize length = env->GetStringLength(jstr);
jniExceptionCheck(env); jniExceptionCheck(env);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment