From c9e3eb6f03a07f663c7cd1f82e683bdd96c8bdea Mon Sep 17 00:00:00 2001 From: Sebastian Rasmussen Date: Fri, 16 Sep 2016 22:40:09 +0800 Subject: JNI: Check if get_context has thrown exception, But do not check it twice. --- platform/java/mupdf_native.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'platform') diff --git a/platform/java/mupdf_native.c b/platform/java/mupdf_native.c index d77f101b..84743e26 100644 --- a/platform/java/mupdf_native.c +++ b/platform/java/mupdf_native.c @@ -4992,6 +4992,7 @@ FUN(DocumentWriter_newNativeDocumentWriter)(JNIEnv *env, jobject self, jstring j const char *format = NULL; const char *options = NULL; + if (!ctx) return 0; if (!jfilename) { jni_throw_arg(env, "filename must not be null"); return 0; } filename = (*env)->GetStringUTFChars(env, jfilename, NULL); @@ -5728,6 +5729,7 @@ FUN(PDFDocument_graftObject)(JNIEnv *env, jobject self, jobject jsrc, jobject jo pdf_obj *obj = from_PDFObject(env, jobj); pdf_graft_map *map = from_PDFGraftMap(env, jmap); + if (!ctx) return NULL; if (!src) { jni_throw_arg(env, "source must not be null"); return NULL; } fz_try(ctx) @@ -6885,7 +6887,6 @@ FUN(PDFObject_putDictionaryPDFObjectInteger)(JNIEnv *env, jobject self, jobject pdf_obj *name = from_PDFObject(env, jname); pdf_obj *val = NULL; - if (!ctx) return; if (!ctx) return; fz_try(ctx) @@ -6908,7 +6909,6 @@ FUN(PDFObject_putDictionaryPDFObjectFloat)(JNIEnv *env, jobject self, jobject jn pdf_obj *name = from_PDFObject(env, jname); pdf_obj *val = NULL; - if (!ctx) return; if (!ctx) return; fz_try(ctx) -- cgit v1.2.3