|
 |
94b862 |
Backport of the upstream commits:
|
|
|
94b862 |
|
|
|
94b862 |
From d91198abd00fc435a397fe6bad906a4c1748e9cf Mon Sep 17 00:00:00 2001
|
|
|
94b862 |
From: Michael Adams <mdadams@ece.uvic.ca>
|
|
|
94b862 |
Date: Sun, 23 Oct 2016 03:34:35 -0700
|
|
|
94b862 |
Subject: [PATCH] Fixed another integer overflow problem.
|
|
|
94b862 |
|
|
|
94b862 |
From a712a2041085e7cd5f2b153e1532ac2a2954ffaa Mon Sep 17 00:00:00 2001
|
|
|
94b862 |
From: Michael Adams <mdadams@ece.uvic.ca>
|
|
|
94b862 |
Date: Thu, 2 Mar 2017 09:28:42 -0800
|
|
|
94b862 |
Subject: [PATCH] Added some additional checking to prevent a potential integer
|
|
|
94b862 |
overflow due to conversion in the JPC decoder.
|
|
|
94b862 |
|
|
|
94b862 |
diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_dec.c jasper-1.900.1/src/libjasper/jpc/jpc_dec.c
|
|
|
94b862 |
--- jasper-1.900.1.orig/src/libjasper/jpc/jpc_dec.c 2017-03-31 22:12:06.000000000 +0200
|
|
|
94b862 |
+++ jasper-1.900.1/src/libjasper/jpc/jpc_dec.c 2017-03-31 22:14:46.112781219 +0200
|
|
|
94b862 |
@@ -1174,6 +1174,7 @@ static int jpc_dec_process_siz(jpc_dec_t
|
|
|
94b862 |
int htileno;
|
|
|
94b862 |
int vtileno;
|
|
|
94b862 |
jpc_dec_cmpt_t *cmpt;
|
|
|
94b862 |
+ size_t size;
|
|
|
94b862 |
|
|
|
94b862 |
dec->xstart = siz->xoff;
|
|
|
94b862 |
dec->ystart = siz->yoff;
|
|
|
94b862 |
@@ -1210,7 +1211,11 @@ static int jpc_dec_process_siz(jpc_dec_t
|
|
|
94b862 |
|
|
|
94b862 |
dec->numhtiles = JPC_CEILDIV(dec->xend - dec->tilexoff, dec->tilewidth);
|
|
|
94b862 |
dec->numvtiles = JPC_CEILDIV(dec->yend - dec->tileyoff, dec->tileheight);
|
|
|
94b862 |
- dec->numtiles = dec->numhtiles * dec->numvtiles;
|
|
|
94b862 |
+ if (!jas_safe_size_mul(dec->numhtiles, dec->numvtiles, &size) ||
|
|
|
94b862 |
+ size > INT_MAX) {
|
|
|
94b862 |
+ return -1;
|
|
|
94b862 |
+ }
|
|
|
94b862 |
+ dec->numtiles = size;
|
|
|
94b862 |
if (!(dec->tiles = jas_calloc(dec->numtiles, sizeof(jpc_dec_tile_t)))) {
|
|
|
94b862 |
return -1;
|
|
|
94b862 |
}
|