diff options
| author | Jun Fang <jun_fang@foxitsoftware.com> | 2015-12-24 14:51:19 +0800 |
|---|---|---|
| committer | Jun Fang <jun_fang@foxitsoftware.com> | 2015-12-24 14:51:19 +0800 |
| commit | c70bd39ec72921cc10b613ce9adcd8f07d7f3039 (patch) | |
| tree | ee239f5a1d7beffb8c0e68c8064e14ae1f62e187 /third_party/libopenjpeg20/jp2.c | |
| parent | a669b2767fd9c36c59f6972e2f6d179e3ced52f9 (diff) | |
| download | pdfium-c70bd39ec72921cc10b613ce9adcd8f07d7f3039.tar.xz | |
Merge to XFA: Replace an assertion with returning false
BUG=pdfium:277
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1548583002 .
Review URL: https://codereview.chromium.org/1549873002 .
Diffstat (limited to 'third_party/libopenjpeg20/jp2.c')
| -rw-r--r-- | third_party/libopenjpeg20/jp2.c | 8 |
1 files changed, 6 insertions, 2 deletions
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; |