summaryrefslogtreecommitdiff
path: root/platform/java
diff options
context:
space:
mode:
authorSebastian Rasmussen <sebras@gmail.com>2017-11-14 00:55:52 +0100
committerTor Andersson <tor.andersson@artifex.com>2017-11-22 23:09:51 +0100
commit5c1d4f82a6e24ab537e5183bbf2082b92822ffdd (patch)
treed7cd3c2c69ccf7c466ec86877eb996a01bdc88ac /platform/java
parent60cfecfafbf7af96fde1137fbdf715366bb18c51 (diff)
downloadmupdf-5c1d4f82a6e24ab537e5183bbf2082b92822ffdd.tar.xz
jni: Check for exception after allocating objects.
Diffstat (limited to 'platform/java')
-rw-r--r--platform/java/mupdf_native.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/platform/java/mupdf_native.c b/platform/java/mupdf_native.c
index 4bf035ff..ddc1dfb4 100644
--- a/platform/java/mupdf_native.c
+++ b/platform/java/mupdf_native.c
@@ -1018,7 +1018,7 @@ static inline jobject to_Image(fz_context *ctx, JNIEnv *env, fz_image *img)
fz_keep_image(ctx, img);
jimg = (*env)->NewObject(env, cls_Image, mid_Image_init, jlong_cast(img));
- if (!jimg)
+ if ((*env)->ExceptionCheck(env))
fz_throw_java(ctx, env);
return jimg;
@@ -1031,7 +1031,7 @@ static inline jobject to_Matrix(fz_context *ctx, JNIEnv *env, const fz_matrix *m
if (!ctx) return NULL;
jctm = (*env)->NewObject(env, cls_Matrix, mid_Matrix_init, mat->a, mat->b, mat->c, mat->d, mat->e, mat->f);
- if (!jctm)
+ if ((*env)->ExceptionCheck(env))
fz_throw_java(ctx, env);
return jctm;
@@ -1045,7 +1045,7 @@ static inline jobject to_Path(fz_context *ctx, JNIEnv *env, const fz_path *path)
fz_keep_path(ctx, path);
jpath = (*env)->NewObject(env, cls_Path, mid_Path_init, jlong_cast(path));
- if (!jpath)
+ if ((*env)->ExceptionCheck(env))
fz_throw_java(ctx, env);
return jpath;
@@ -1058,7 +1058,7 @@ static inline jobject to_Rect(fz_context *ctx, JNIEnv *env, const fz_rect *rect)
if (!ctx) return NULL;
jrect = (*env)->NewObject(env, cls_Rect, mid_Rect_init, rect->x0, rect->y0, rect->x1, rect->y1);
- if (!jrect)
+ if ((*env)->ExceptionCheck(env))
fz_throw_java(ctx, env);
return jrect;
@@ -1072,7 +1072,7 @@ static inline jobject to_Shade(fz_context *ctx, JNIEnv *env, fz_shade *shd)
fz_keep_shade(ctx, shd);
jshd = (*env)->NewObject(env, cls_Shade, mid_Shade_init, jlong_cast(shd));
- if (!jshd)
+ if ((*env)->ExceptionCheck(env))
fz_throw_java(ctx, env);
return jshd;
@@ -1086,7 +1086,7 @@ static inline jobject to_StrokeState(fz_context *ctx, JNIEnv *env, const fz_stro
fz_keep_stroke_state(ctx, state);
jstate = (*env)->NewObject(env, cls_StrokeState, mid_StrokeState_init, jlong_cast(state));
- if (!jstate)
+ if ((*env)->ExceptionCheck(env))
fz_throw_java(ctx, env);
return jstate;
@@ -1100,7 +1100,7 @@ static inline jobject to_Text(fz_context *ctx, JNIEnv *env, const fz_text *text)
fz_keep_text(ctx, text);
jtext = (*env)->NewObject(env, cls_Text, mid_Text_init, jlong_cast(text));
- if (!jtext)
+ if ((*env)->ExceptionCheck(env))
fz_throw_java(ctx, env);
return jtext;