71 lines
3.0 KiB
Diff
71 lines
3.0 KiB
Diff
From f8992b8fe65c170c8624226f127c5c4bfed42c66 Mon Sep 17 00:00:00 2001
|
|
From: Shailesh Mistry <shailesh.mistry@hotmail.co.uk>
|
|
Date: Wed, 26 Apr 2017 22:12:14 +0100
|
|
Subject: [PATCH] Bug 697693: Prevent SEGV due to integer overflow.
|
|
|
|
While building a Huffman table, the start and end points were susceptible
|
|
to integer overflow.
|
|
|
|
Thank you to Jiaqi for finding this issue and suggesting a patch.
|
|
---
|
|
jbig2_huffman.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/jbig2_huffman.c b/jbig2_huffman.c
|
|
index 511e461..b4189a1 100644
|
|
--- a/jbig2_huffman.c
|
|
+++ b/jbig2_huffman.c
|
|
@@ -421,8 +421,8 @@ jbig2_build_huffman_table(Jbig2Ctx *ctx, const Jbig2HuffmanParams *params)
|
|
|
|
if (PREFLEN == CURLEN) {
|
|
int RANGELEN = lines[CURTEMP].RANGELEN;
|
|
- int start_j = CURCODE << shift;
|
|
- int end_j = (CURCODE + 1) << shift;
|
|
+ uint32_t start_j = CURCODE << shift;
|
|
+ uint32_t end_j = (CURCODE + 1) << shift;
|
|
byte eflags = 0;
|
|
|
|
if (end_j > max_j) {
|
|
--
|
|
2.9.3
|
|
|
|
commit 258290340bb657c9efb44457f717b0d8b49f4aa3
|
|
Author: Shailesh Mistry <shailesh.mistry@hotmail.co.uk>
|
|
Date: Wed May 3 22:06:01 2017 +0100
|
|
|
|
Bug 697703: Prevent integer overflow vulnerability.
|
|
|
|
Add extra check for the offset being greater than the size
|
|
of the image and hence reading off the end of the buffer.
|
|
|
|
Thank you to Dai Ge for finding this issue and suggesting a patch.
|
|
|
|
diff --git a/jbig2_symbol_dict.c b/jbig2_symbol_dict.c
|
|
index 4acaba9..36225cb 100644
|
|
--- a/jbig2_symbol_dict.c
|
|
+++ b/jbig2_symbol_dict.c
|
|
@@ -629,7 +629,7 @@ jbig2_decode_symbol_dict(Jbig2Ctx *ctx,
|
|
byte *dst = image->data;
|
|
|
|
/* SumatraPDF: prevent read access violation */
|
|
- if (size - jbig2_huffman_offset(hs) < image->height * stride) {
|
|
+ if ((size - jbig2_huffman_offset(hs) < image->height * stride) || (size < jbig2_huffman_offset(hs))) {
|
|
jbig2_error(ctx, JBIG2_SEVERITY_FATAL, segment->number, "not enough data for decoding (%d/%d)", image->height * stride,
|
|
size - jbig2_huffman_offset(hs));
|
|
jbig2_image_release(ctx, image);
|
|
|
|
diff --git a/jbig2_image.c b/jbig2_image.c
|
|
index 1ae614e..bddb3cd 100644
|
|
--- a/jbig2_image.c
|
|
+++ b/jbig2_image.c
|
|
@@ -256,7 +256,8 @@ jbig2_image_compose(Jbig2Ctx *ctx, Jbig2Image *dst, Jbig2Image *src, int x, int
|
|
/* general OR case */
|
|
s = ss;
|
|
d = dd = dst->data + y * dst->stride + leftbyte;
|
|
- if (d < dst->data || leftbyte > dst->stride || h * dst->stride < 0 || d - leftbyte + h * dst->stride > dst->data + dst->height * dst->stride) {
|
|
+ if (d < dst->data || leftbyte > dst->stride || h * dst->stride < 0 || d - leftbyte + h * dst->stride > dst->data + dst->height * dst->stride ||
|
|
+ s - leftbyte + (h - 1) * src->stride + rightbyte > src->data + src->height * src->stride) {
|
|
return jbig2_error(ctx, JBIG2_SEVERITY_FATAL, -1, "preventing heap overflow in jbig2_image_compose");
|
|
}
|
|
if (leftbyte == rightbyte) {
|