diff options
author | Ryan Harrison <rharrison@chromium.org> | 2018-09-04 18:58:21 +0000 |
---|---|---|
committer | Chromium commit bot <commit-bot@chromium.org> | 2018-09-04 18:58:21 +0000 |
commit | 6b2e2f0ec7c5f629c5270d14c2339197af7392d8 (patch) | |
tree | bb043a95cb8470b25158d3671c9484a156e30d14 /third_party/libpng16/0003-check-errors-in-set-pcal.patch | |
parent | d8b5feae1180185b7d1a41682b2b1a565dd5c630 (diff) | |
download | pdfium-6b2e2f0ec7c5f629c5270d14c2339197af7392d8.tar.xz |
Update libpng from 1.6.22 -> 1.6.34
Updates third_party/libpng16 to Chromium's third_party/libpng @
e87a02987101e2dbe319a4aba6b52470f7624b4a and applies PDFium specific
patches.
BUG=chromium:880322
Change-Id: I6724f55099c70a79da6d6e4863b9c6c9157ec571
Reviewed-on: https://pdfium-review.googlesource.com/41910
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Ryan Harrison <rharrison@chromium.org>
Diffstat (limited to 'third_party/libpng16/0003-check-errors-in-set-pcal.patch')
-rw-r--r-- | third_party/libpng16/0003-check-errors-in-set-pcal.patch | 47 |
1 files changed, 0 insertions, 47 deletions
diff --git a/third_party/libpng16/0003-check-errors-in-set-pcal.patch b/third_party/libpng16/0003-check-errors-in-set-pcal.patch deleted file mode 100644 index 58e27ba623..0000000000 --- a/third_party/libpng16/0003-check-errors-in-set-pcal.patch +++ /dev/null @@ -1,47 +0,0 @@ -diff --git a/pngset.c b/pngset.c -index cccd9cd..83d6ce2 100644 ---- a/pngset.c -+++ b/pngset.c -@@ -283,17 +283,29 @@ png_set_pCAL(png_const_structrp png_ptr, png_inforpinfo_ptr, - - /* Check that the type matches the specification. */ - if (type < 0 || type > 3) -- png_error(png_ptr, "Invalid pCAL equation type"); -+ { -+ png_chunk_report(png_ptr, "Invalid pCAL equation type", -+ PNG_CHUNK_WRITE_ERROR); -+ return; -+ } - - if (nparams < 0 || nparams > 255) -- png_error(png_ptr, "Invalid pCAL parameter count"); -+ { -+ png_chunk_report(png_ptr, "Invalid pCAL parameter count", -+ PNG_CHUNK_WRITE_ERROR); -+ return; -+ } - - /* Validate params[nparams] */ - for (i=0; i<nparams; ++i) - { - if (params[i] == NULL || - !png_check_fp_string(params[i], strlen(params[i]))) -- png_error(png_ptr, "Invalid format for pCAL parameter"); -+ { -+ png_chunk_report(png_ptr, "Invalid format for pCAL parameter", -+ PNG_CHUNK_WRITE_ERROR); -+ return; -+ } - } - - info_ptr->pcal_purpose = png_voidcast(png_charp, -@@ -301,8 +313,8 @@ png_set_pCAL(png_const_structrp png_ptr, png_inforpinfo_ptr, - - if (info_ptr->pcal_purpose == NULL) - { -- png_warning(png_ptr, "Insufficient memory for pCAL purpose"); -- -+ png_chunk_report(png_ptr, "Insufficient memory for pCAL purpose", -+ PNG_CHUNK_WRITE_ERROR); - return; - } |