[SCM] libdca packaging branch, master, updated. debian/0.0.5-2-9-gb0aef89

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

The following commit has been merged in the master branch:
commit 548576d170de5c2c95081407b984f41147d1d757
Author: Fabian Greffrath <fabian at debian-unofficial.org>
Date:   Tue Jun 16 11:28:42 2009 +0200

    debian/patches/r88-fix-random-crashes-caused-by-invalid-32-bit-shifts.patch: Fix random crashes caused by invalid 32-bit shifts on 32-bit values.

diff --git a/debian/patches/r88-fix-random-crashes-caused-by-invalid-32-bit-shifts.patch b/debian/patches/r88-fix-random-crashes-caused-by-invalid-32-bit-shifts.patch
new file mode 100644
index 0000000..e36b48b
--- /dev/null
+++ b/debian/patches/r88-fix-random-crashes-caused-by-invalid-32-bit-shifts.patch
@@ -0,0 +1,43 @@
+r88 | sam | 2008-07-19 22:26:13 +0000 (Sat, 19 Jul 2008) | 2 lines
+  * bitstream.c: fix random crashes caused by invalid 32-bit shifts on 32-bit
+    values.
+
+--- libdca.orig/libdca/bitstream.c
++++ libdca/libdca/bitstream.c
+@@ -25,6 +25,7 @@
+ 
+ #include "config.h"
+ 
++#include <stdio.h>
+ #include <inttypes.h>
+ 
+ #include "dca.h"
+@@ -46,7 +47,7 @@
+     state->bigendian_mode = bigendian_mode;
+     bitstream_get (state, align * 8);
+ }
+-#include<stdio.h>
++
+ static inline void bitstream_fill_current (dca_state_t * state)
+ {
+     uint32_t tmp;
+@@ -76,12 +77,14 @@
+ 
+ uint32_t dca_bitstream_get_bh (dca_state_t * state, uint32_t num_bits)
+ {
+-    uint32_t result;
+-
+-    num_bits -= state->bits_left;
++    uint32_t result = 0;
+ 
+-    result = ((state->current_word << (32 - state->bits_left)) >>
+-	      (32 - state->bits_left));
++    if (state->bits_left)
++    {
++	num_bits -= state->bits_left;
++        result = ((state->current_word << (32 - state->bits_left)) >>
++		  (32 - state->bits_left));
++    }
+ 
+     if ( !state->word_mode && num_bits > 28 ) {
+         bitstream_fill_current (state);
diff --git a/debian/patches/series b/debian/patches/series
index 06a5208..ca85ec6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 r83-mark-tables-as-static-constants.patch 
 r84-normalisation-factor-sqrt2+output-bias.patch 
 r87-sanity-check-for-subframes-and-prim_channels.patch 
+r88-fix-random-crashes-caused-by-invalid-32-bit-shifts.patch 

-- 
libdca packaging