diff options
| author | Oliver Chang <ochang@chromium.org> | 2015-12-14 15:16:09 -0800 |
|---|---|---|
| committer | Oliver Chang <ochang@chromium.org> | 2015-12-14 15:16:09 -0800 |
| commit | f86d3f946e2f1977c7eaea01dcb9d7ecb3064cd1 (patch) | |
| tree | b1e27edc20c1b425459f9f431d6517f9975b5d8c /third_party/libopenjpeg20/jp2.c | |
| parent | 6e698d13cde3391eaf745e90649a6bec1c72b0b7 (diff) | |
| download | pdfium-f86d3f946e2f1977c7eaea01dcb9d7ecb3064cd1.tar.xz | |
Merge to XFA: openjpeg: Fix crash in opj_jp2_apply_pclr
TBR=tsepez@chromium.org
BUG=554172
Original Review URL: https://codereview.chromium.org/1492693003 .
(cherry picked from commit 3026f26aa69e983837d05a5477fe22e79aed0d26)
Review URL: https://codereview.chromium.org/1520323003 .
Diffstat (limited to 'third_party/libopenjpeg20/jp2.c')
| -rw-r--r-- | third_party/libopenjpeg20/jp2.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/third_party/libopenjpeg20/jp2.c b/third_party/libopenjpeg20/jp2.c index 47f83a1abc..6e910a911a 100644 --- a/third_party/libopenjpeg20/jp2.c +++ b/third_party/libopenjpeg20/jp2.c @@ -902,7 +902,7 @@ static OPJ_BOOL opj_jp2_check_color(opj_image_t *image, opj_jp2_color_t *color, opj_event_msg(p_manager, EVT_ERROR, "Invalid component/palette index for direct mapping %d.\n", pcol); is_sane = OPJ_FALSE; } - else if (pcol_usage[pcol] && cmap[i].mtyp == 1) { + else if (pcol_usage[pcol] && cmap[i].mtyp != 0) { opj_event_msg(p_manager, EVT_ERROR, "Component %d is mapped twice.\n", pcol); is_sane = OPJ_FALSE; } @@ -982,8 +982,8 @@ static void opj_jp2_apply_pclr(opj_image_t *image, opj_jp2_color_t *color) assert( pcol == 0 ); new_comps[i] = old_comps[cmp]; } else { - assert( i == pcol ); - new_comps[pcol] = old_comps[cmp]; + assert( i == pcol ); // probably wrong? + new_comps[i] = old_comps[cmp]; } /* Palette mapping: */ @@ -1007,11 +1007,11 @@ static void opj_jp2_apply_pclr(opj_image_t *image, opj_jp2_color_t *color) cmp = cmap[i].cmp; pcol = cmap[i].pcol; src = old_comps[cmp].data; assert( src ); - max = new_comps[pcol].w * new_comps[pcol].h; + max = new_comps[i].w * new_comps[i].h; /* Direct use: */ if(cmap[i].mtyp == 0) { - assert( cmp == 0 ); + assert( cmp == 0 ); // probably wrong. dst = new_comps[i].data; assert( dst ); for(j = 0; j < max; ++j) { @@ -1019,8 +1019,8 @@ static void opj_jp2_apply_pclr(opj_image_t *image, opj_jp2_color_t *color) } } else { - assert( i == pcol ); - dst = new_comps[pcol].data; + assert( i == pcol ); // probably wrong? + dst = new_comps[i].data; assert( dst ); for(j = 0; j < max; ++j) { /* The index */ |