[SCM] mplayer/master: Use patch from upstream

mati75-guest at users.alioth.debian.org mati75-guest at users.alioth.debian.org
Sun May 8 19:38:00 UTC 2016


The following commit has been merged in the master branch:
commit 9919f03de232831b026acf4905c041e4bb2dd37d
Author: Mateusz Łukasik <mati75 at linuxmint.pl>
Date:   Sun May 8 21:38:16 2016 +0200

    Use patch from upstream

diff --git a/debian/patches/CVE-2016-4352.patch b/debian/patches/CVE-2016-4352.patch
index cfcee47..1296d3a 100644
--- a/debian/patches/CVE-2016-4352.patch
+++ b/debian/patches/CVE-2016-4352.patch
@@ -6,7 +6,7 @@ Debian-Bug: https://bugs.debian.org/823723
 
 --- a/libmpdemux/demux_gif.c
 +++ b/libmpdemux/demux_gif.c
-@@ -265,6 +265,17 @@
+@@ -304,6 +304,17 @@
      return NULL;
    }
  
@@ -16,7 +16,7 @@ Debian-Bug: https://bugs.debian.org/823723
 +           "[demux_gif] Unsupported picture size %dx%d.\n", gif->SWidth,
 +           gif->SHeight);
 +    if (DGifCloseFile(gif) == GIF_ERROR)
-+      PrintGifError();
++      print_gif_error(NULL);
 +    free(priv);
 +    return NULL;
 +  }
@@ -24,3 +24,4 @@ Debian-Bug: https://bugs.debian.org/823723
    // create a new video stream header
    sh_video = new_sh_video(demuxer, 0);
  
+

-- 
mplayer packaging



More information about the pkg-multimedia-commits mailing list