Commit 01c266e2 authored by Leonardo Arena's avatar Leonardo Arena
Browse files

main/gst-plugins-ugly1: upgrade to 1.8.3 -fixes #7240

parent 6ab23d65
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=gst-plugins-ugly1
pkgver=1.8.1
pkgrel=1
pkgver=1.8.3
pkgrel=0
pkgdesc="GStreamer Multimedia Framework Ugly Plugins (gst-plugins-ugly)"
url="http://gstreamer.freedesktop.org/"
arch="all"
......@@ -22,14 +22,27 @@ makedepends="
orc-dev
x264-dev
"
source="http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-$pkgver.tar.xz"
source="http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-$pkgver.tar.xz
CVE-2017-5846.patch
CVE-2017-5847.patch
"
subpackages="$pkgname-lang"
ldpath="/usr/lib/gstreamer-1.0"
_builddir="$srcdir"/gst-plugins-ugly-$pkgver
# secfixes:
# 1.8.3-r0:
# - CVE-2017-5846
# - CVE-2017-5847
prepare() {
cd "$_builddir"
for i in $source; do
case $i in
*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
esac
done
}
build() {
......@@ -53,6 +66,12 @@ package() {
cd "$_builddir"
make DESTDIR="$pkgdir" install || return 1
}
md5sums="b6f47bcb3d924f7ef8a8b33ac4d037ab gst-plugins-ugly-1.8.1.tar.xz"
sha256sums="8e656a9a3be60d7e7ed3fb8e2a22d070b1f54f95d0b22accd876360e659446ce gst-plugins-ugly-1.8.1.tar.xz"
sha512sums="349767c0d688eb62097d47115e14303f80648d4387e414d73a8a18de0b566d4d35d57121d103cce74d0d33c00cbe9fc109e7342a205eb5f03e54b2552812f760 gst-plugins-ugly-1.8.1.tar.xz"
md5sums="4fc66c77253b0ad5ce224bda654b2e7d gst-plugins-ugly-1.8.3.tar.xz
f138fb180ca52836873a62f042c2624e CVE-2017-5846.patch
ee218582262b27c48444ac410b457df1 CVE-2017-5847.patch"
sha256sums="6fa2599fdd072d31fbaf50c34af406e2be944a010b1f4eab67a5fe32a0310693 gst-plugins-ugly-1.8.3.tar.xz
9bb90e54d0d8faf1bcc6e7911255466b62b3ac01d72826bd04ac6367cdf710dc CVE-2017-5846.patch
52137d24ebc8acfc5696f093a8f33d6d647bbe6a5501e625ba011deb92e87ce6 CVE-2017-5847.patch"
sha512sums="b4297cbcb553997fbad47a39ad75f655e725629468c71b5af4b30d40309aa0924bd2bf790686db766f6eaacaf69850d1cebf88106dd2b3c24b65a511e54eb484 gst-plugins-ugly-1.8.3.tar.xz
96ceb02d51425adf50b8f0db766f66d63ac95fef647b2c48ccbb554f25826cdeed7951fa2178b487bd76e042ce2514b87f3d78fbd81d7af67468102bb49646a2 CVE-2017-5846.patch
96e700167e6a0753d95b940f8a752e4d329161ac89bac0d0dadc3e0f3a4b67565906598cd9f51d2402f9a96be0ea5d3d3a0b3f718034a6bc6690d9866f944c82 CVE-2017-5847.patch"
From dec880031d16f1ee4919a36f49298419246cf6a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
Date: Mon, 30 Jan 2017 15:39:59 +0200
Subject: asfdemux: Reset number of languages to 0 when freeing the array
because of errors
Otherwise we will happily index into the array at NULL if the requested
index is smaller than the number of languages that were previously
allocated.
https://bugzilla.gnome.org/show_bug.cgi?id=777937
diff --git a/gst/asfdemux/gstasfdemux.c b/gst/asfdemux/gstasfdemux.c
index ea5158f..255a427 100644
--- a/gst/asfdemux/gstasfdemux.c
+++ b/gst/asfdemux/gstasfdemux.c
@@ -3962,6 +3962,7 @@ not_enough_data:
GST_WARNING_OBJECT (demux, "short read parsing language list object!");
g_free (demux->languages);
demux->languages = NULL;
+ demux->num_languages = 0;
return GST_FLOW_OK; /* not fatal */
}
}
--
cgit v0.10.2
From d21017b52a585f145e8d62781bcc1c5fefc7ee37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
Date: Tue, 31 Jan 2017 13:50:21 +0200
Subject: [PATCH] asfdemux: Check that we have enough data available before
parsing bool/uint extended content descriptors
https://bugzilla.gnome.org/show_bug.cgi?id=777955
---
gst/asfdemux/gstasfdemux.c | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/gst/asfdemux/gstasfdemux.c b/gst/asfdemux/gstasfdemux.c
index 255a427..b8d48ad 100644
--- a/gst/asfdemux/gstasfdemux.c
+++ b/gst/asfdemux/gstasfdemux.c
@@ -3439,7 +3439,12 @@ gst_asf_demux_process_ext_content_desc (GstASFDemux * demux, guint8 * data,
break;
}
case ASF_DEMUX_DATA_TYPE_DWORD:{
- guint uint_val = GST_READ_UINT32_LE (value);
+ guint uint_val;
+
+ if (value_len < 4)
+ break;
+
+ uint_val = GST_READ_UINT32_LE (value);
/* this is the track number */
g_value_init (&tag_value, G_TYPE_UINT);
@@ -3453,7 +3458,12 @@ gst_asf_demux_process_ext_content_desc (GstASFDemux * demux, guint8 * data,
}
/* Detect 3D */
case ASF_DEMUX_DATA_TYPE_BOOL:{
- gboolean bool_val = GST_READ_UINT32_LE (value);
+ gboolean bool_val;
+
+ if (value_len < 4)
+ break;
+
+ bool_val = GST_READ_UINT32_LE (value);
if (strncmp ("Stereoscopic", name_utf8, strlen (name_utf8)) == 0) {
if (bool_val) {
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment