[SCM] handbrake/master: debian/patches: Add patch to fix memcpy with overlapping memory regions.

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

The following commit has been merged in the master branch:
commit 29280ffa6672b7d5c59921af88325d2c3bfdda47
Author: Rogério Brito <rbrito at ime.usp.br>
Date:   Fri Jun 22 13:14:56 2012 -0300

    debian/patches: Add patch to fix memcpy with overlapping memory regions.

diff --git a/debian/patches/0001-libhb-Fix-erroneous-memcpy-used-with-overlapping-mem.patch b/debian/patches/0001-libhb-Fix-erroneous-memcpy-used-with-overlapping-mem.patch
new file mode 100644
index 0000000..d74131d
--- /dev/null
+++ b/debian/patches/0001-libhb-Fix-erroneous-memcpy-used-with-overlapping-mem.patch
@@ -0,0 +1,32 @@
+From f18f1e71e8c48e7d4fbcc3879e9b2515422f3999 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Rog=C3=A9rio=20Brito?= <rbrito at ime.usp.br>
+Date: Fri, 22 Jun 2012 13:11:10 -0300
+Subject: [PATCH] libhb: Fix erroneous memcpy used with overlapping memory
+ locations.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This was discovered while running ghb under valgrind.
+
+Signed-off-by: Rogério Brito <rbrito at ime.usp.br>
+---
+ libhb/deca52.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libhb/deca52.c b/libhb/deca52.c
+index a8d537d..d137a96 100644
+--- a/libhb/deca52.c
++++ b/libhb/deca52.c
+@@ -374,7 +374,7 @@ static int deca52BSInfo( hb_work_object_t *w, const hb_buffer_t *b,
+             // discard enough bytes from the front of the buffer to make
+             // room for the new stuff
+             int newlen = sizeof(w->audio->priv.config.a52.buf) - blen;
+-            memcpy( buf, buf + len - newlen, newlen );
++            memmove( buf, buf + len - newlen, newlen );
+             len = newlen;
+         }
+     }
+-- 
+1.7.10
+
diff --git a/debian/patches/series b/debian/patches/series
index fe8d44e..4e1e200 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+0001-libhb-Fix-erroneous-memcpy-used-with-overlapping-mem.patch
 0001-Remove-encoding-indication-from-desktop-file.patch
 0002-Fix-include-with-the-system-s-libav.patch
 0003-Remove-embedded-downloaded-copies-of-various-librari.patch

-- 
handbrake packaging