Merge remote-tracking branch 'oe_21/master' into vuplus-3.0

[vuplus_openvuplus_3.0] / meta-openvuplus / recipes-support / libshairport / libshairport / 004_fix_bad_access.patch

diff --git a/meta-openvuplus/recipes-support/libshairport/libshairport/004_fix_bad_access.patch b/meta-openvuplus/recipes-support/libshairport/libshairport/004_fix_bad_access.patch
new file mode 100644 (file)
index 0000000..1976904
--- /dev/null
+++ b/meta-openvuplus/recipes-support/libshairport/libshairport/004_fix_bad_access.patch
@@ -0,0 +1,22 @@
+--- src/hairtunes.c.orig       2011-09-25 23:26:56.000000000 +0200
++++ src/hairtunes.c    2011-09-25 23:29:27.000000000 +0200
+@@ -89,7 +89,6 @@
+ // maximal resampling shift - conservative
+ #define OUTFRAME_BYTES (4*(frame_size+3))
+ 
+-
+ alac_file *decoder_info;
+ 
+ #ifdef FANCY_RESAMPLING
+@@ -849,6 +848,11 @@
+             inbuf = buffer_get_frame();
+         } while (!inbuf && audio_running);
+ 
++        if(!audio_running)
++        {
++          return 0; //don't access inbuf if audio stopped
++        }
++
+ #ifdef FANCY_RESAMPLING
+         if (fancy_resampling) {
+               int i;