diff options
author | Tor Andersson <tor.andersson@artifex.com> | 2015-10-29 13:42:40 +0100 |
---|---|---|
committer | Tor Andersson <tor.andersson@artifex.com> | 2015-10-29 13:42:40 +0100 |
commit | 2f0b62b1c02cb6826168ad73023697980b251fe6 (patch) | |
tree | 395a475488bbec8193a5d49f31fd8a865841c95f /include/mupdf/fitz/context.h | |
parent | 3c61390fe24cc20114f9bb9d43a0b17926da762f (diff) | |
download | mupdf-2f0b62b1c02cb6826168ad73023697980b251fe6.tar.xz |
Fix 696303: Off-by-one error when checking for exception stack overflow.
Diffstat (limited to 'include/mupdf/fitz/context.h')
-rw-r--r-- | include/mupdf/fitz/context.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/mupdf/fitz/context.h b/include/mupdf/fitz/context.h index cb083f87..67b16b00 100644 --- a/include/mupdf/fitz/context.h +++ b/include/mupdf/fitz/context.h @@ -50,7 +50,7 @@ void fz_var_imp(void *); */ #define fz_try(ctx) \ - {{{ fz_push_try(ctx->error); \ + {{{ fz_push_try(ctx); \ if (fz_setjmp(ctx->error->stack[ctx->error->top].buffer) == 0)\ { do { @@ -67,10 +67,10 @@ void fz_var_imp(void *); } }}} \ if (ctx->error->stack[ctx->error->top--].code > 1) -void fz_push_try(fz_error_context *ex); -FZ_NORETURN void fz_throw(fz_context *, int errcode, const char *, ...) __printflike(3, 4); -FZ_NORETURN void fz_rethrow(fz_context *); -FZ_NORETURN void fz_rethrow_message(fz_context *, const char *, ...) __printflike(2, 3); +void fz_push_try(fz_context *ctx); +FZ_NORETURN void fz_throw(fz_context *ctx, int errcode, const char *, ...) __printflike(3, 4); +FZ_NORETURN void fz_rethrow(fz_context *ctx); +FZ_NORETURN void fz_rethrow_message(fz_context *ctx, const char *fmt, ...) __printflike(2, 3); void fz_warn(fz_context *ctx, const char *fmt, ...) __printflike(2, 3); const char *fz_caught_message(fz_context *ctx); int fz_caught(fz_context *ctx); |