libpng: fix CVE-2019-7317

(From OE-Core rev: 983d4757db7d46dcd4116269c4446392e28f16fb)

(From OE-Core rev: ab4483fbd95fecb951e765ebc7da918b503142ca)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ross Burton 2019-03-05 16:30:03 +00:00 committed by Richard Purdie
parent c707714cfe
commit 22febdc60e
2 changed files with 22 additions and 1 deletions

View File

@ -0,0 +1,20 @@
Use-after-free detected with static analysis.
CVE: CVE-2019-7317
Upstream-Status: Submitted [https://github.com/glennrp/libpng/issues/275]
Signed-off-by: Ross Burton <ross.burton@intel.com>
diff --git a/png.c b/png.c
index 9d9926f638..efd1aecfbd 100644
--- a/png.c
+++ b/png.c
@@ -4588,8 +4588,7 @@ png_image_free(png_imagep image)
if (image != NULL && image->opaque != NULL &&
image->opaque->error_buf == NULL)
{
- /* Ignore errors here: */
- (void)png_safe_execute(image, png_image_free_function, image);
+ png_image_free_function(image);
image->opaque = NULL;
}
}

View File

@ -9,7 +9,8 @@ DEPENDS = "zlib"
LIBV = "16"
SRC_URI = "${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}${LIBV}/${PV}/${BP}.tar.xz"
SRC_URI = "${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}${LIBV}/${PV}/${BP}.tar.xz \
file://CVE-2019-7317.patch"
SRC_URI[md5sum] = "df2be2d29c40937fe1f5349b16bc2826"
SRC_URI[sha256sum] = "eceb924c1fa6b79172fdfd008d335f0e59172a86a66481e09d4089df872aa319"