diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-11-16 11:23:40 +0000 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2015-11-16 19:07:39 +0100 |
| commit | 0d77e2faa95e440e5bde96432ade122e1804a0cc (patch) | |
| tree | bfa5fc331f455b23b02b9d54515d2c080c856afe | |
| parent | 7c7acde337bbd31809ff07d51d82f51e91708325 (diff) | |
bump png to 1.5.24 CVE-2015-7981 + CVE-2015-8126
Change-Id: Ice54f6c89eb2a2492d2b55a3f4edb13df4192446
Reviewed-on: https://gerrit.libreoffice.org/19985
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
(cherry picked from commit 055c248e1573cc7cd7988b28f8bb0bf64bf0d6c8)
| -rw-r--r-- | download.lst | 4 | ||||
| -rw-r--r-- | external/libpng/configs/pnglibconf.h | 16 |
2 files changed, 10 insertions, 10 deletions
diff --git a/download.lst b/download.lst index 015e7b7bbff0..53f13e81e390 100644 --- a/download.lst +++ b/download.lst @@ -117,8 +117,8 @@ export OWNCLOUD_ANDROID_LIB_TARBALL := owncloud-android-library-0.9.4-no-binary- export PAGEMAKER_MD5SUM := 795cc7a59ace4db2b12586971d668671 export PAGEMAKER_TARBALL := libpagemaker-0.0.2.tar.bz2 export PIXMAN_TARBALL := c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2 -export PNG_MD5SUM := 5266905cef49d1224437465ad4d67fd9 -export PNG_TARBALL := libpng-1.5.18.tar.gz +export PNG_MD5SUM := 6652e428d1d3fc3c6cb1362159b1cf3b +export PNG_TARBALL := libpng-1.5.24.tar.gz export POPPLER_MD5SUM := 35c0660065d023365e9854c13e289d12 export POPPLER_TARBALL := poppler-0.26.4.tar.gz export POSTGRESQL_TARBALL := c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2 diff --git a/external/libpng/configs/pnglibconf.h b/external/libpng/configs/pnglibconf.h index 9e97d1e7800a..8149f59394aa 100644 --- a/external/libpng/configs/pnglibconf.h +++ b/external/libpng/configs/pnglibconf.h @@ -1,9 +1,9 @@ -/* 1.5.18 STANDARD API DEFINITION */ +/* 1.5.24 STANDARD API DEFINITION */ /* pnglibconf.h - library build configuration */ -/* libpng version 1.5.18 - February 6, 2014 */ +/* libpng version 1.5.24 - November 12, 2015 */ -/* Copyright (c) 1998-2013 Glenn Randers-Pehrson */ +/* Copyright (c) 1998-2015 Glenn Randers-Pehrson */ /* This code is released under the libpng license. */ /* For conditions of distribution and use, see the disclaimer */ @@ -95,8 +95,6 @@ #define PNG_SAVE_INT_32_SUPPORTED #define PNG_SEQUENTIAL_READ_SUPPORTED #define PNG_SETJMP_SUPPORTED -#define PNG_SET_CHUNK_CACHE_LIMIT_SUPPORTED -#define PNG_SET_CHUNK_MALLOC_LIMIT_SUPPORTED /*#undef PNG_SET_OPTION_SUPPORTED*/ #define PNG_SET_USER_LIMITS_SUPPORTED #define PNG_STDIO_SUPPORTED @@ -114,6 +112,7 @@ #define PNG_WRITE_BGR_SUPPORTED #define PNG_WRITE_CHECK_FOR_INVALID_INDEX_SUPPORTED #define PNG_WRITE_COMPRESSED_TEXT_SUPPORTED +#define PNG_WRITE_CUSTOMIZE_COMPRESSION_SUPPORTED #define PNG_WRITE_CUSTOMIZE_ZTXT_COMPRESSION_SUPPORTED #define PNG_WRITE_FILLER_SUPPORTED #define PNG_WRITE_FILTER_SUPPORTED @@ -172,15 +171,16 @@ /* end of options */ /* settings */ #define PNG_API_RULE 0 -#define PNG_CALLOC_SUPPORTED -#define PNG_COST_SHIFT 3 #define PNG_DEFAULT_READ_MACROS 1 #define PNG_GAMMA_THRESHOLD_FIXED 5000 #define PNG_MAX_GAMMA_8 11 #define PNG_QUANTIZE_BLUE_BITS 5 #define PNG_QUANTIZE_GREEN_BITS 5 #define PNG_QUANTIZE_RED_BITS 5 -#define PNG_WEIGHT_SHIFT 8 +#define PNG_USER_CHUNK_CACHE_MAX 1000 +#define PNG_USER_CHUNK_MALLOC_MAX 8000000 +#define PNG_USER_HEIGHT_MAX 1000000 +#define PNG_USER_WIDTH_MAX 1000000 #define PNG_ZBUF_SIZE 8192 #define PNG_sCAL_PRECISION 5 /* end of settings */ |