[SCM] vlc/master: Remove codec-schroedinger-fix-potential-buffer-overflow.patch

[mati75-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 5bf370a782115557729ce50f0589ffb5b92c1e5e
Author: Mateusz Łukasik <mati75 at linuxmint.pl>
Date:   Thu Apr 16 19:39:53 2015 +0200

    Remove codec-schroedinger-fix-potential-buffer-overflow.patch

diff --git a/debian/changelog b/debian/changelog
index 48d0f38..ee62c02 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
 vlc (2.2.1-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * debian/patches:
+    - Remove codec-schroedinger-fix-potential-buffer-overflow.patch
+    -- included upstream.
 
  -- Mateusz Łukasik <mati75 at linuxmint.pl>  Thu, 16 Apr 2015 19:37:11 +0200
 
diff --git a/debian/patches/codec-schroedinger-fix-potential-buffer-overflow.patch b/debian/patches/codec-schroedinger-fix-potential-buffer-overflow.patch
deleted file mode 100644
index 31502ad..0000000
--- a/debian/patches/codec-schroedinger-fix-potential-buffer-overflow.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From: Fabian Yamaguchi <fyamagu at gwdg.de>
-Subject: [PATCH] codec: schroedinger: fix potential buffer overflow.
- The variable len is a raw 32 bit value read using GetDWBE. If this
- value is larger than UINT32_MAX - sizeof(eos), this will cause an
- integer overflow in the subsequent call to malloc, and finally a
- buffer overflow when calling memcpy. We fix this by checking len
- accordingly.
-Origin: upstream, http://git.videolan.org/?p=vlc.git;a=commitdiff;h=9bb0353a5c63a7f8c6fc853faa3df4b4df1f5eb5
-Bug-Debian: https://bugs.debian.org/775866
-Last-Update: 2015-01-21
-
-diff --git a/modules/codec/schroedinger.c b/modules/codec/schroedinger.c
-index f48aa2b..977afca 100644
---- a/modules/codec/schroedinger.c
-+++ b/modules/codec/schroedinger.c
-@@ -1548,6 +1548,10 @@ static block_t *Encode( encoder_t *p_enc, picture_t *p_pic )
-                      * is appended to the sequence header to allow guard
-                      * against poor streaming servers */
-                     /* XXX, should this be done using the packetizer ? */
-+
-+                    if( len > UINT32_MAX - sizeof( eos ) )
-+                        return NULL;
-+
-                     p_enc->fmt_out.p_extra = malloc( len + sizeof( eos ) );
-                     if( !p_enc->fmt_out.p_extra )
-                         return NULL;
--- 
-2.1.4
-

-- 
VLC media player packaging