diff options
Diffstat (limited to 'poky/meta/recipes-multimedia/libpng')
| -rw-r--r-- | poky/meta/recipes-multimedia/libpng/files/CVE-2018-13785.patch | 37 | ||||
| -rw-r--r-- | poky/meta/recipes-multimedia/libpng/libpng_1.6.35.bb (renamed from poky/meta/recipes-multimedia/libpng/libpng_1.6.34.bb) | 13 |
2 files changed, 6 insertions, 44 deletions
diff --git a/poky/meta/recipes-multimedia/libpng/files/CVE-2018-13785.patch b/poky/meta/recipes-multimedia/libpng/files/CVE-2018-13785.patch deleted file mode 100644 index 84b1af1fb..000000000 --- a/poky/meta/recipes-multimedia/libpng/files/CVE-2018-13785.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 8a05766cb74af05c04c53e6c9d60c13fc4d59bf2 Mon Sep 17 00:00:00 2001 -From: Cosmin Truta <ctruta@gmail.com> -Date: Sun, 17 Jun 2018 22:56:29 -0400 -Subject: [PATCH] [libpng16] Fix the calculation of row_factor in - png_check_chunk_length - -(Bug report by Thuan Pham, SourceForge issue #278) -Upstream-Status: Backport [https://github.com/glennrp/libpng/commit/8a05766cb74af05c04c53e6c9d60c13fc4d59bf2] -Signed-off-by: Sinan Kaya <okaya@kernel.org> ---- - pngrutil.c | 9 ++++++--- - 1 file changed, 6 insertions(+), 3 deletions(-) - -diff --git a/pngrutil.c b/pngrutil.c -index 95571b517..5ba995abf 100644 ---- a/pngrutil.c -+++ b/pngrutil.c -@@ -3167,10 +3167,13 @@ png_check_chunk_length(png_const_structrp png_ptr, const png_uint_32 length) - { - png_alloc_size_t idat_limit = PNG_UINT_31_MAX; - size_t row_factor = -- (png_ptr->width * png_ptr->channels * (png_ptr->bit_depth > 8? 2: 1) -- + 1 + (png_ptr->interlaced? 6: 0)); -+ (size_t)png_ptr->width -+ * (size_t)png_ptr->channels -+ * (png_ptr->bit_depth > 8? 2: 1) -+ + 1 -+ + (png_ptr->interlaced? 6: 0); - if (png_ptr->height > PNG_UINT_32_MAX/row_factor) -- idat_limit=PNG_UINT_31_MAX; -+ idat_limit = PNG_UINT_31_MAX; - else - idat_limit = png_ptr->height * row_factor; - row_factor = row_factor > 32566? 32566 : row_factor; --- -2.19.0 - diff --git a/poky/meta/recipes-multimedia/libpng/libpng_1.6.34.bb b/poky/meta/recipes-multimedia/libpng/libpng_1.6.35.bb index 3877d6cbf..5ae0a91a7 100644 --- a/poky/meta/recipes-multimedia/libpng/libpng_1.6.34.bb +++ b/poky/meta/recipes-multimedia/libpng/libpng_1.6.35.bb @@ -2,17 +2,16 @@ SUMMARY = "PNG image format decoding library" HOMEPAGE = "http://www.libpng.org/" SECTION = "libs" LICENSE = "Libpng" -LIC_FILES_CHKSUM = "file://LICENSE;md5=2db717a05a20e36f2fa673265bd31568 \ - file://png.h;endline=144;md5=3ac9fd250a8786ae581e34254bf79429" +LIC_FILES_CHKSUM = "file://LICENSE;md5=4791381a76f106ac4699f6261c65ee29 \ + file://png.h;endline=144;md5=090ba5769782e8a1663a45fab1c2b36c \ + " DEPENDS = "zlib" LIBV = "16" -SRC_URI = "${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}${LIBV}/${PV}/${BP}.tar.xz \ - file://CVE-2018-13785.patch \ -" -SRC_URI[md5sum] = "c05b6ca7190a5e387b78657dbe5536b2" -SRC_URI[sha256sum] = "2f1e960d92ce3b3abd03d06dfec9637dfbd22febf107a536b44f7a47c60659f6" +SRC_URI = "${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}${LIBV}/${PV}/${BP}.tar.xz" +SRC_URI[md5sum] = "678b7e696a62a193ed3503b04bf449d6" +SRC_URI[sha256sum] = "23912ec8c9584917ed9b09c5023465d71709dce089be503c7867fec68a93bcd7" MIRRORS += "${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}${LIBV}/${PV}/ ${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}${LIBV}/older-releases/${PV}/" |
