From c373cc8e44b0b32220088059ada161edfd0a2d78 Mon Sep 17 00:00:00 2001 From: Robin Watts Date: Thu, 21 Mar 2013 16:50:52 +0000 Subject: Bug 693719: Android: Catch exceptions when counting pages. Return 0. Check for this case when opening a PDF and give a nice dialogue. Fix the nice dialogue code so that it doesn't crash afterwards due to a null mSearchTask. --- android/jni/mupdf.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'android/jni') diff --git a/android/jni/mupdf.c b/android/jni/mupdf.c index 74d9970d..c929e13e 100644 --- a/android/jni/mupdf.c +++ b/android/jni/mupdf.c @@ -447,8 +447,18 @@ JNIEXPORT int JNICALL JNI_FN(MuPDFCore_countPagesInternal)(JNIEnv *env, jobject thiz) { globals *glo = get_globals(env, thiz); + fz_context *ctx = glo->ctx; + int count = 0; - return fz_count_pages(glo->doc); + fz_try(ctx) + { + count = fz_count_pages(glo->doc); + } + fz_catch(ctx) + { + LOGE("exception while counting pages: %s", ctx->error->message); + } + return count; } JNIEXPORT void JNICALL -- cgit v1.2.3