From: Ross Burton <ross.burton@intel.com>
Date: Wed, 6 Nov 2019 15:37:56 +0000 (+0200)
Subject: libpng: whitelist CVE-2019-17371
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=581fa36d300fda00ae50c07b038fe847887f7ed3;p=openembedded-core.git

libpng: whitelist CVE-2019-17371

This is actually a memory leak in gif2png 2.x, so whitelist it in the libpng
recipe.

(From OE-Core rev: 341e43ebd935daeb592cb073bf00f80c49a8ec2d)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

Conflicts:
	meta/recipes-multimedia/libpng/libpng_1.6.37.bb
---

diff --git a/meta/recipes-multimedia/libpng/libpng_1.6.34.bb b/meta/recipes-multimedia/libpng/libpng_1.6.34.bb
index 3877d6cbf0..2edf268396 100644
--- a/meta/recipes-multimedia/libpng/libpng_1.6.34.bb
+++ b/meta/recipes-multimedia/libpng/libpng_1.6.34.bb
@@ -30,3 +30,6 @@ PACKAGES =+ "${PN}-tools"
 FILES_${PN}-tools = "${bindir}/png-fix-itxt ${bindir}/pngfix ${bindir}/pngcp"
 
 BBCLASSEXTEND = "native nativesdk"
+
+# CVE-2019-17371 is actually a memory leak in gif2png 2.x
+CVE_CHECK_WHITELIST += "CVE-2019-17371"