summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--patches/libflac/CVE-2017-6888.patch27
-rw-r--r--vars/build.vars5
2 files changed, 31 insertions, 1 deletions
diff --git a/patches/libflac/CVE-2017-6888.patch b/patches/libflac/CVE-2017-6888.patch
new file mode 100644
index 00000000..7c829be9
--- /dev/null
+++ b/patches/libflac/CVE-2017-6888.patch
@@ -0,0 +1,27 @@
+From 4f47b63e9c971e6391590caf00a0f2a5ed612e67 Mon Sep 17 00:00:00 2001
+From: Erik de Castro Lopo <erikd@mega-nerd.com>
+Date: Sat, 8 Apr 2017 18:34:49 +1000
+Subject: [PATCH] stream_decoder.c: Fix a memory leak
+
+Leak reported by Secunia Research.
+---
+ src/libFLAC/stream_decoder.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/libFLAC/stream_decoder.c b/src/libFLAC/stream_decoder.c
+index 14d5fe7..a552751 100644
+--- a/src/libFLAC/stream_decoder.c
++++ b/src/libFLAC/stream_decoder.c
+@@ -1753,6 +1753,9 @@ FLAC__bool read_metadata_vorbiscomment_(FLAC__StreamDecoder *decoder, FLAC__Stre
+ }
+ memset (obj->comments[i].entry, 0, obj->comments[i].length) ;
+ if (!FLAC__bitreader_read_byte_block_aligned_no_crc(decoder->private_->input, obj->comments[i].entry, obj->comments[i].length)) {
++ /* Current i-th entry is bad, so we delete it. */
++ free (obj->comments[i].entry) ;
++ obj->comments[i].entry = NULL ;
+ obj->num_comments = i;
+ goto skip;
+ }
+--
+2.1.4
+
diff --git a/vars/build.vars b/vars/build.vars
index b844f9b4..1397c735 100644
--- a/vars/build.vars
+++ b/vars/build.vars
@@ -412,7 +412,7 @@ NATIVE_PACKAGES_DEPS_PACKAGES="
clzip expat libxml2 alsa_lib apr apr_util bzip2 libdmtx libressl libnettle
libunistring gnutls curl libz lmdb libpng libjpeg_turbo tiff giflib lcms2 libffi gdbm
geoip pcre glib gzip libarchive libatomic_ops musl_compat libbsd libpipeline
-libevent libfetch libogg libvorbis libtheora libsasl2 libsndfile libgpg_error libassuan
+libevent libfetch libogg libvorbis libflac libtheora libsasl2 libsndfile libgpg_error libassuan
libfirm libgcrypt libksba libudns lua ncurses ncursestw ncursesw libreadline
libxslt libtirpc npth popt file xz zstd rpm libsolv tdnf shared_mime_info
sqlite3 w32api w32lib libuv cmake qrencode util_linux slang";
@@ -551,6 +551,9 @@ NATIVE_PACKAGES_DEPS_PYTHON="${PREFIX}/bin/python";
: ${PKG_LIBVORBIS_SHA256SUM:=54f94a9527ff0a88477be0a71c0bab09a4c3febe0ed878b24824906cd4b0e1d1};
: ${PKG_LIBVORBIS_VERSION:=1.3.5};
: ${PKG_LIBVORBIS_URL:=https://ftp.osuosl.org/pub/xiph/releases/vorbis/libvorbis-${PKG_LIBVORBIS_VERSION}.tar.xz};
+: ${PKG_LIBFLAC_SHA256SUM:=91cfc3ed61dc40f47f050a109b08610667d73477af6ef36dcad31c31a4a8d53f};
+: ${PKG_LIBFLAC_VERSION:=1.3.2};
+: ${PKG_LIBFLAC_URL:=https://ftp.osuosl.org/pub/xiph/releases/flac/flac-${PKG_LIBFLAC_VERSION}.tar.xz};
: ${PKG_LIBTHEORA_SHA256SUM:=b6ae1ee2fa3d42ac489287d3ec34c5885730b1296f0801ae577a35193d3affbc};
: ${PKG_LIBTHEORA_VERSION:=1.1.1};
: ${PKG_LIBTHEORA_URL:=http://downloads.xiph.org/releases/theora/libtheora-${PKG_LIBTHEORA_VERSION}.tar.bz2};