From a8bc3df0bc5f9c86908376e1deac9888b0dfbfc8 Mon Sep 17 00:00:00 2001 From: sevan Date: Tue, 26 Nov 2019 23:24:25 +0000 Subject: pasto --- graphics/openjpeg/distinfo | 4 ++-- graphics/openjpeg/patches/patch-src_lib_openmj2_t2.c | 11 +++++++---- 2 files changed, 9 insertions(+), 6 deletions(-) (limited to 'graphics') diff --git a/graphics/openjpeg/distinfo b/graphics/openjpeg/distinfo index e7cc918b29d..2a1d9ddc8b0 100644 --- a/graphics/openjpeg/distinfo +++ b/graphics/openjpeg/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.15 2019/11/26 23:10:22 sevan Exp $ +$NetBSD: distinfo,v 1.16 2019/11/26 23:24:25 sevan Exp $ SHA1 (openjpeg-2.3.1.tar.gz) = 38321fa9730252039ad0b7f247a160a8164f5871 RMD160 (openjpeg-2.3.1.tar.gz) = 31b75aa70f5d26dd1b7e374a9e4b6be1842fefe7 @@ -8,4 +8,4 @@ SHA1 (patch-CMakeLists.txt) = 3738946db63df4d623c6ce486bd22fa4d57336e2 SHA1 (patch-src_bin_jp2_CMakeLists.txt) = c9f709c23d6bab7a3c705640d66a00ec90ddabc7 SHA1 (patch-src_lib_openjp2_CMakeLists.txt) = d839121ec2d008e5d3e1676d3e7ac3642bc946f7 SHA1 (patch-src_lib_openjp2_opj__config__private.h.cmake.in) = fc0c170789dbe0a2ebc9dce0ef0d21aa6b2edd49 -SHA1 (patch-src_lib_openmj2_t2.c) = 7689b3d82a5d346707a3519f183757356e118a8c +SHA1 (patch-src_lib_openmj2_t2.c) = a4ce0faa349f1a23453ef7632fbcc3af2d045337 diff --git a/graphics/openjpeg/patches/patch-src_lib_openmj2_t2.c b/graphics/openjpeg/patches/patch-src_lib_openmj2_t2.c index 055b194f0a1..8f9dbb88abf 100644 --- a/graphics/openjpeg/patches/patch-src_lib_openmj2_t2.c +++ b/graphics/openjpeg/patches/patch-src_lib_openmj2_t2.c @@ -1,12 +1,12 @@ -$NetBSD: patch-src_lib_openmj2_t2.c,v 1.1 2019/11/26 23:10:22 sevan Exp $ +$NetBSD: patch-src_lib_openmj2_t2.c,v 1.2 2019/11/26 23:24:25 sevan Exp $ CVE-2018-16376 https://github.com/uclouvain/openjpeg/issues/1127 https://nvd.nist.gov/vuln/detail/CVE-2018-16376 ---- src/lib/openmj2/t2.c.orig 2019-11-26 22:37:00.687890833 +0000 +--- src/lib/openmj2/t2.c.orig 2019-04-02 12:45:15.000000000 +0000 +++ src/lib/openmj2/t2.c -@@ -166,6 +166,12 @@ static int t2_encode_packet(opj_tcd_tile +@@ -166,6 +166,15 @@ static int t2_encode_packet(opj_tcd_tile /* */ if (tcp->csty & J2K_CP_CSTY_SOP) { @@ -16,10 +16,13 @@ https://nvd.nist.gov/vuln/detail/CVE-2018-16376 + "opj_t2_encode_packet(): only %u bytes remaining in " + "output buffer. %u needed.\n", + length, 6); ++ } ++ return OPJ_FALSE; ++ } c[0] = 255; c[1] = 145; c[2] = 0; -@@ -272,6 +278,15 @@ static int t2_encode_packet(opj_tcd_tile +@@ -272,6 +281,15 @@ static int t2_encode_packet(opj_tcd_tile /* */ if (tcp->csty & J2K_CP_CSTY_EPH) { -- cgit v1.2.3