[SCM] faad2/master: Fix segmentation fault in faad due to an incorrect pointer size (Closes: #603807, LP: #665802).

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 72c4fa27071f1309e8b1b555bd099ef6a16a1657
Author: Alessio Treglia <alessio at debian.org>
Date:   Wed Nov 17 17:13:44 2010 +0100

    Fix segmentation fault in faad due to an incorrect pointer size (Closes: #603807, LP: #665802).

diff --git a/debian/patches/incorrect_pointer_size.patch b/debian/patches/incorrect_pointer_size.patch
new file mode 100644
index 0000000..0ca0017
--- /dev/null
+++ b/debian/patches/incorrect_pointer_size.patch
@@ -0,0 +1,35 @@
+Description: faad segfaults on amd64 due to incorrect pointer size
+ When running faad with a command line similar to:
+  alessio at alessio-laptop:~$ faad -b 2 -f 2 -w sample.aac
+ a SIGSEGV gets raised. This issue is due to an incorrect pointer size
+ used in the write_audio{32,64}bit functions.
+Origin: Ubuntu
+Bug: https://sourceforge.net/support/tracker.php?aid=3110758
+Bug-Debian: http://bugs.debian.org/603807
+Bug-Ubuntu: https://launchpad.net/bugs/665802
+Reviewed-by: Alessio Treglia <alessio at debian.org>
+Last-Update: 2010-11-17
+---
+ frontend/audio.c |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- faad2.orig/frontend/audio.c
++++ faad2/frontend/audio.c
+@@ -347,7 +347,7 @@ static int write_audio_24bit(audio_file
+ {
+     int ret;
+     unsigned int i;
+-    long *sample_buffer24 = (long*)sample_buffer;
++    int *sample_buffer24 = (int*)sample_buffer;
+     char *data = malloc(samples*aufile->bits_per_sample*sizeof(char)/8);
+ 
+     aufile->total_samples += samples;
+@@ -391,7 +391,7 @@ static int write_audio_32bit(audio_file
+ {
+     int ret;
+     unsigned int i;
+-    long *sample_buffer32 = (long*)sample_buffer;
++    int *sample_buffer32 = (int*)sample_buffer;
+     char *data = malloc(samples*aufile->bits_per_sample*sizeof(char)/8);
+ 
+     aufile->total_samples += samples;
diff --git a/debian/patches/series b/debian/patches/series
index 1ba3b4f..f176393 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 manpage.patch
 bpa-stdin.patch
 path_max.patch
+incorrect_pointer_size.patch

-- 
faad2 packaging