diff options
| author | Lei Zhang <thestig@chromium.org> | 2017-08-23 01:05:02 -0700 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-08-23 20:55:09 +0000 |
| commit | 664d4b82ac5156488b7e437d4cc54a3ef94d2811 (patch) | |
| tree | 8d31d943c30ea3ecc444ec16d6d3396e15e3c82f /third_party/libpng16/pngpriv.h | |
| parent | 0924119cae45955525b25c915b3eda90d3e3bd20 (diff) | |
| download | pdfium-664d4b82ac5156488b7e437d4cc54a3ef94d2811.tar.xz | |
Reject oversized iCCP profile length in libpng.chromium/3195
cherry-pick of https://github.com/glennrp/libpng/commit/92a7c79db2c962d04006b35e2603ba9d5ce75541
BUG=chromium:729673
Change-Id: I907b4920ed6d276a075a30269be1744aff678069
Reviewed-on: https://pdfium-review.googlesource.com/11690
Commit-Queue: Lei Zhang <thestig@chromium.org>
Reviewed-by: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'third_party/libpng16/pngpriv.h')
| -rw-r--r-- | third_party/libpng16/pngpriv.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/third_party/libpng16/pngpriv.h b/third_party/libpng16/pngpriv.h index 9ea023fea7..6336713526 100644 --- a/third_party/libpng16/pngpriv.h +++ b/third_party/libpng16/pngpriv.h @@ -1541,9 +1541,11 @@ PNG_INTERNAL_FUNCTION(int,png_colorspace_set_ICC,(png_const_structrp png_ptr, /* The 'name' is used for information only */ /* Routines for checking parts of an ICC profile. */ +#ifdef PNG_READ_iCCP_SUPPORTED PNG_INTERNAL_FUNCTION(int,png_icc_check_length,(png_const_structrp png_ptr, png_colorspacerp colorspace, png_const_charp name, png_uint_32 profile_length), PNG_EMPTY); +#endif /* READ_iCCP */ PNG_INTERNAL_FUNCTION(int,png_icc_check_header,(png_const_structrp png_ptr, png_colorspacerp colorspace, png_const_charp name, png_uint_32 profile_length, |