Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1369)

Unified Diff: third_party/libopenjpeg20/0008-jp2_check_color.patch

Issue 1548583002: Replace an assertion with returning false (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master
Patch Set: Shorten the description in README.pdfium Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | third_party/libopenjpeg20/README.pdfium » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/libopenjpeg20/0008-jp2_check_color.patch
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 0000000000000000000000000000000000000000..3810c8669eecc24bafcc547a7ad9f0f7eae6351b
--- /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;
« no previous file with comments | « no previous file | third_party/libopenjpeg20/README.pdfium » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698