diff options
| author |   Ilya Tumaykin <itumaykin@gmail.com> | 2016-01-18 22:45:47 +0300 |
|---|---|---|
| committer |   Patrice Clement <monsieurp@gentoo.org> | 2016-01-18 20:48:12 +0000 |
| commit | fd9b596cf9e8a8efb5dbb0041496b45fbe8249fd (patch) | |
| tree | def6d65251c68e0c98b69cab857bab4a1bde52b3 | |
| parent | dev-haskell/gtk2hs-buildtools: build fix fox alex3.1.7, bug #572260 (diff) | |
| download | gentoo-fd9b596cf9e8a8efb5dbb0041496b45fbe8249fd.tar.gz gentoo-fd9b596cf9e8a8efb5dbb0041496b45fbe8249fd.tar.bz2 gentoo-fd9b596cf9e8a8efb5dbb0041496b45fbe8249fd.zip | |
media-video/mpv: revbump to 0.15.0-r1 to fix null pointer dereference
Upstream issue: https://github.com/mpv-player/mpv/issues/2729
Package-Manager: portage-2.2.26
| -rw-r--r-- | media-video/mpv/files/mpv-0.15.0-fix-null-pointer-dereference.patch | 21 | ||||
| -rw-r--r-- | media-video/mpv/mpv-0.15.0-r1.ebuild (renamed from media-video/mpv/mpv-0.15.0.ebuild) | 2 |
2 files changed, 23 insertions, 0 deletions
diff --git a/media-video/mpv/files/mpv-0.15.0-fix-null-pointer-dereference.patch b/media-video/mpv/files/mpv-0.15.0-fix-null-pointer-dereference.patch new file mode 100644 index 000000000000..4cc4c87f3096 --- /dev/null +++ b/media-video/mpv/files/mpv-0.15.0-fix-null-pointer-dereference.patch @@ -0,0 +1,21 @@ +commit 5053f4cc3f48538c3d9a3ba13dc98442f3302052 +Author: wm4 <wm4@nowhere> +Date: Mon Jan 18 20:10:28 2016 +0100 + + command: fix NULL pointer deref in "video-codec" property + + Fixes #2729. + +diff --git a/player/command.c b/player/command.c +index 3c7cfb2..413349d 100644 +--- a/player/command.c ++++ b/player/command.c +@@ -2438,7 +2438,7 @@ static int mp_property_video_codec(void *ctx, struct m_property *prop, + { + MPContext *mpctx = ctx; + struct track *track = mpctx->current_track[0][STREAM_VIDEO]; +- const char *c = track->d_video ? track->d_video->decoder_desc : NULL; ++ const char *c = track && track->d_video ? track->d_video->decoder_desc : NULL; + return m_property_strdup_ro(action, arg, c); + } + diff --git a/media-video/mpv/mpv-0.15.0.ebuild b/media-video/mpv/mpv-0.15.0-r1.ebuild index b6a029730825..ca974a9bd286 100644 --- a/media-video/mpv/mpv-0.15.0.ebuild +++ b/media-video/mpv/mpv-0.15.0-r1.ebuild @@ -161,6 +161,8 @@ pkg_pretend() { src_prepare() { cp "${DISTDIR}/waf-${WAF_PV}" "${S}"/waf || die chmod +x "${S}"/waf || die + + epatch "${FILESDIR}/${P}-fix-null-pointer-dereference.patch" epatch_user } |