summaryrefslogtreecommitdiff
path: root/third_party/libopenjpeg20/0019-tcd_init_tile.patch
diff options
context:
space:
mode:
authorgogil <gogil@stealien.com>2016-08-04 16:48:04 -0700
committerCommit bot <commit-bot@chromium.org>2016-08-04 16:48:04 -0700
commitff74356915d4c7f7c6eb16de1e9f403da4ecb6d5 (patch)
treea73676ece147df315ef9699d4e10cd8cfe929b94 /third_party/libopenjpeg20/0019-tcd_init_tile.patch
parent1b4f6b36b3ed8d1f6cea96bc32c1b376f4a499bc (diff)
downloadpdfium-ff74356915d4c7f7c6eb16de1e9f403da4ecb6d5.tar.xz
openjpeg: Prevent integer overflows during calculation of |l_nb_code_blocks_size|
BUG=628890 R=ochang@chromium.org Review-Url: https://codereview.chromium.org/2212973002
Diffstat (limited to 'third_party/libopenjpeg20/0019-tcd_init_tile.patch')
-rw-r--r--third_party/libopenjpeg20/0019-tcd_init_tile.patch30
1 files changed, 30 insertions, 0 deletions
diff --git a/third_party/libopenjpeg20/0019-tcd_init_tile.patch b/third_party/libopenjpeg20/0019-tcd_init_tile.patch
new file mode 100644
index 0000000000..d8e18facc9
--- /dev/null
+++ b/third_party/libopenjpeg20/0019-tcd_init_tile.patch
@@ -0,0 +1,30 @@
+diff --git a/third_party/libopenjpeg20/README.pdfium b/third_party/libopenjpeg20/README.pdfium
+index a9e289d..b1012af 100644
+--- a/third_party/libopenjpeg20/README.pdfium
++++ b/third_party/libopenjpeg20/README.pdfium
+@@ -28,4 +28,5 @@ Local Modifications:
+ 0016-read_SQcd_SQcc_overflow.patch: Prevent a buffer overflow in opj_j2k_read_SQcd_SQcc.
+ 0017-tcd_init_tile.patch: Prevent integer overflows during calculation of |l_nb_precinct_size|.
+ 0018-tcd_get_decoded_tile_size.patch: Fix an integer overflow in opj_tcd_get_decoded_tile_size.
++0019-tcd_init_tile.patch: Prevent integer overflows during calculation of |l_nb_code_blocks_size|.
+ TODO(thestig): List all the other patches.
+diff --git a/third_party/libopenjpeg20/tcd.c b/third_party/libopenjpeg20/tcd.c
+index cd1c439..9270efe 100644
+--- a/third_party/libopenjpeg20/tcd.c
++++ b/third_party/libopenjpeg20/tcd.c
+@@ -939,8 +939,15 @@ static INLINE OPJ_BOOL opj_tcd_init_tile(opj_tcd_t *p_tcd, OPJ_UINT32 p_tile_no,
+ l_current_precinct->cw = (OPJ_UINT32)((brcblkxend - tlcblkxstart) >> cblkwidthexpn);
+ l_current_precinct->ch = (OPJ_UINT32)((brcblkyend - tlcblkystart) >> cblkheightexpn);
+
++ if (l_current_precinct->cw && ((OPJ_UINT32)-1) / l_current_precinct->cw < l_current_precinct->ch) {
++ return OPJ_FALSE;
++ }
+ l_nb_code_blocks = l_current_precinct->cw * l_current_precinct->ch;
+ /*fprintf(stderr, "\t\t\t\t precinct_cw = %d x recinct_ch = %d\n",l_current_precinct->cw, l_current_precinct->ch); */
++
++ if (((OPJ_UINT32)-1) / (OPJ_UINT32)sizeof_block < l_nb_code_blocks) {
++ return OPJ_FALSE;
++ }
+ l_nb_code_blocks_size = l_nb_code_blocks * (OPJ_UINT32)sizeof_block;
+
+ if (! l_current_precinct->cblks.blocks) {