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

Side by Side Diff: third_party/libpng/pngpriv.h

Issue 2939383002: libpng: Reject oversized iCCP profile length (Closed)
Patch Set: Created 3 years, 6 months 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 unified diff | Download patch
« no previous file with comments | « third_party/libpng/png.c ('k') | third_party/libpng/pngtest.c » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 1
2 /* pngpriv.h - private declarations for use inside libpng 2 /* pngpriv.h - private declarations for use inside libpng
3 * 3 *
4 * Last changed in libpng 1.6.22 [May 26, 2016] 4 * Last changed in libpng 1.6.22 [May 26, 2016]
5 * Copyright (c) 1998-2002,2004,2006-2016 Glenn Randers-Pehrson 5 * Copyright (c) 1998-2002,2004,2006-2016 Glenn Randers-Pehrson
6 * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) 6 * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
7 * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) 7 * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
8 * 8 *
9 * This code is released under the libpng license. 9 * This code is released under the libpng license.
10 * For conditions of distribution and use, see the disclaimer 10 * For conditions of distribution and use, see the disclaimer
(...skipping 1523 matching lines...) Expand 10 before | Expand all | Expand 10 after
1534 #endif /* sRGB */ 1534 #endif /* sRGB */
1535 1535
1536 #ifdef PNG_iCCP_SUPPORTED 1536 #ifdef PNG_iCCP_SUPPORTED
1537 PNG_INTERNAL_FUNCTION(int,png_colorspace_set_ICC,(png_const_structrp png_ptr, 1537 PNG_INTERNAL_FUNCTION(int,png_colorspace_set_ICC,(png_const_structrp png_ptr,
1538 png_colorspacerp colorspace, png_const_charp name, 1538 png_colorspacerp colorspace, png_const_charp name,
1539 png_uint_32 profile_length, png_const_bytep profile, int color_type), 1539 png_uint_32 profile_length, png_const_bytep profile, int color_type),
1540 PNG_EMPTY); 1540 PNG_EMPTY);
1541 /* The 'name' is used for information only */ 1541 /* The 'name' is used for information only */
1542 1542
1543 /* Routines for checking parts of an ICC profile. */ 1543 /* Routines for checking parts of an ICC profile. */
1544 #ifdef PNG_READ_iCCP_SUPPORTED
1544 PNG_INTERNAL_FUNCTION(int,png_icc_check_length,(png_const_structrp png_ptr, 1545 PNG_INTERNAL_FUNCTION(int,png_icc_check_length,(png_const_structrp png_ptr,
1545 png_colorspacerp colorspace, png_const_charp name, 1546 png_colorspacerp colorspace, png_const_charp name,
1546 png_uint_32 profile_length), PNG_EMPTY); 1547 png_uint_32 profile_length), PNG_EMPTY);
1548 #endif /* READ_iCCP */
1547 PNG_INTERNAL_FUNCTION(int,png_icc_check_header,(png_const_structrp png_ptr, 1549 PNG_INTERNAL_FUNCTION(int,png_icc_check_header,(png_const_structrp png_ptr,
1548 png_colorspacerp colorspace, png_const_charp name, 1550 png_colorspacerp colorspace, png_const_charp name,
1549 png_uint_32 profile_length, 1551 png_uint_32 profile_length,
1550 png_const_bytep profile /* first 132 bytes only */, int color_type), 1552 png_const_bytep profile /* first 132 bytes only */, int color_type),
1551 PNG_EMPTY); 1553 PNG_EMPTY);
1552 PNG_INTERNAL_FUNCTION(int,png_icc_check_tag_table,(png_const_structrp png_ptr, 1554 PNG_INTERNAL_FUNCTION(int,png_icc_check_tag_table,(png_const_structrp png_ptr,
1553 png_colorspacerp colorspace, png_const_charp name, 1555 png_colorspacerp colorspace, png_const_charp name,
1554 png_uint_32 profile_length, 1556 png_uint_32 profile_length,
1555 png_const_bytep profile /* header plus whole tag table */), PNG_EMPTY); 1557 png_const_bytep profile /* header plus whole tag table */), PNG_EMPTY);
1556 #ifdef PNG_sRGB_SUPPORTED 1558 #ifdef PNG_sRGB_SUPPORTED
(...skipping 417 matching lines...) Expand 10 before | Expand all | Expand 10 after
1974 /* Maintainer: Put new private prototypes here ^ */ 1976 /* Maintainer: Put new private prototypes here ^ */
1975 1977
1976 #include "pngdebug.h" 1978 #include "pngdebug.h"
1977 1979
1978 #ifdef __cplusplus 1980 #ifdef __cplusplus
1979 } 1981 }
1980 #endif 1982 #endif
1981 1983
1982 #endif /* PNG_VERSION_INFO_ONLY */ 1984 #endif /* PNG_VERSION_INFO_ONLY */
1983 #endif /* PNGPRIV_H */ 1985 #endif /* PNGPRIV_H */
OLDNEW
« no previous file with comments | « third_party/libpng/png.c ('k') | third_party/libpng/pngtest.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698