diff options
| author | Jun Fang <jun_fang@foxitsoftware.com> | 2015-12-24 14:36:43 +0800 |
|---|---|---|
| committer | Jun Fang <jun_fang@foxitsoftware.com> | 2015-12-24 14:36:43 +0800 |
| commit | f1d406f30ccdc5fe705faa590fbac0a8306b161c (patch) | |
| tree | 07cd416257d5db69085a10a5eeaa31c877d754ae | |
| parent | 9fb1413926b55727d8f00dd54fbe144a883d4873 (diff) | |
| download | pdfium-f1d406f30ccdc5fe705faa590fbac0a8306b161c.tar.xz | |
Replace an assertion with returning false
BUG=pdfium:277
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1548583002 .
| -rw-r--r-- | third_party/libopenjpeg20/0008-jp2_check_color.patch | 19 | ||||
| -rw-r--r-- | third_party/libopenjpeg20/README.pdfium | 1 | ||||
| -rw-r--r-- | third_party/libopenjpeg20/jp2.c | 8 |
3 files changed, 26 insertions, 2 deletions
diff --git a/third_party/libopenjpeg20/0008-jp2_check_color.patch b/third_party/libopenjpeg20/0008-jp2_check_color.patch new file mode 100644 index 0000000000..3810c8669e --- /dev/null +++ b/third_party/libopenjpeg20/0008-jp2_check_color.patch @@ -0,0 +1,19 @@ +diff --git a/third_party/libopenjpeg20/jp2.c b/third_party/libopenjpeg20/jp2.c +index f3baca5..3bcb42e 100644 +--- a/third_party/libopenjpeg20/jp2.c ++++ b/third_party/libopenjpeg20/jp2.c +@@ -896,8 +896,12 @@ static OPJ_BOOL opj_jp2_check_color(opj_image_t *image, opj_jp2_color_t *color, + } + /* verify that no component is targeted more than once */ + for (i = 0; i < nr_channels; i++) { +- OPJ_UINT16 pcol = cmap[i].pcol; +- assert(cmap[i].mtyp == 0 || cmap[i].mtyp == 1); ++ if (cmap[i].mtyp != 0 && cmap[i].mtyp != 1) { ++ opj_event_msg(p_manager, EVT_ERROR, "Unexpected MTYP value.\n"); ++ opj_free(pcol_usage); ++ return OPJ_FALSE; ++ } ++ OPJ_UINT16 pcol = cmap[i].pcol; + if (pcol >= nr_channels) { + opj_event_msg(p_manager, EVT_ERROR, "Invalid component/palette index for direct mapping %d.\n", pcol); + is_sane = OPJ_FALSE; diff --git a/third_party/libopenjpeg20/README.pdfium b/third_party/libopenjpeg20/README.pdfium index 4d5585713b..cbe052aaac 100644 --- a/third_party/libopenjpeg20/README.pdfium +++ b/third_party/libopenjpeg20/README.pdfium @@ -17,4 +17,5 @@ Local Modifications: 0005-jp2_apply_pclr.patch: Fix out of bounds access. 0006-tcd_init_tile.patch: Fix a dividing zero bug in opj_tcd_init_tile(). 0007-jp2_read_cmap.patch: Fix wrong rendering on greyscale images with index colorspace. +0008-jp2_check_color.patch: Replace an assertion with returning false. TODO(thestig): List all the other patches. diff --git a/third_party/libopenjpeg20/jp2.c b/third_party/libopenjpeg20/jp2.c index f3baca53bd..3bcb42ea86 100644 --- a/third_party/libopenjpeg20/jp2.c +++ b/third_party/libopenjpeg20/jp2.c @@ -896,8 +896,12 @@ static OPJ_BOOL opj_jp2_check_color(opj_image_t *image, opj_jp2_color_t *color, } /* verify that no component is targeted more than once */ for (i = 0; i < nr_channels; i++) { - OPJ_UINT16 pcol = cmap[i].pcol; - assert(cmap[i].mtyp == 0 || cmap[i].mtyp == 1); + if (cmap[i].mtyp != 0 && cmap[i].mtyp != 1) { + opj_event_msg(p_manager, EVT_ERROR, "Unexpected MTYP value.\n"); + opj_free(pcol_usage); + return OPJ_FALSE; + } + OPJ_UINT16 pcol = cmap[i].pcol; if (pcol >= nr_channels) { opj_event_msg(p_manager, EVT_ERROR, "Invalid component/palette index for direct mapping %d.\n", pcol); is_sane = OPJ_FALSE; |