[SCM] libdca packaging branch, master, updated. debian/0.0.5-2-9-gb0aef89
fabian-guest at users.alioth.debian.org
fabian-guest at users.alioth.debian.org
Tue Jun 16 09:29:29 UTC 2009
The following commit has been merged in the master branch:
commit 616d835b1737615ed3d37a141759816443c099a0
Author: Fabian Greffrath <fabian at debian-unofficial.org>
Date: Tue Jun 16 11:26:58 2009 +0200
debian/patches/r87-sanity-check-for-subframes-and-prim_channels.patch: Sanity check for subframes and prim_channels to avoid crashes with invalid streams.
diff --git a/debian/patches/r87-sanity-check-for-subframes-and-prim_channels.patch b/debian/patches/r87-sanity-check-for-subframes-and-prim_channels.patch
new file mode 100644
index 0000000..af1a998
--- /dev/null
+++ b/debian/patches/r87-sanity-check-for-subframes-and-prim_channels.patch
@@ -0,0 +1,22 @@
+r87 | sam | 2008-07-18 19:22:47 +0000 (Fri, 18 Jul 2008) | 2 lines
+ * parse.c: sanity check for subframes and prim_channels to avoid crashes
+ with invalid streams.
+
+--- libdca.orig/libdca/parse.c
++++ libdca/libdca/parse.c
+@@ -305,8 +305,15 @@
+
+ /* Primary audio coding header */
+ state->subframes = bitstream_get (state, 4) + 1;
++
++ if (state->subframes > DCA_SUBFRAMES_MAX)
++ state->subframes = DCA_SUBFRAMES_MAX;
++
+ state->prim_channels = bitstream_get (state, 3) + 1;
+
++ if (state->prim_channels > DCA_PRIM_CHANNELS_MAX)
++ state->prim_channels = DCA_PRIM_CHANNELS_MAX;
++
+ #ifdef DEBUG
+ fprintf (stderr, "subframes: %i\n", state->subframes);
+ fprintf (stderr, "prim channels: %i\n", state->prim_channels);
diff --git a/debian/patches/series b/debian/patches/series
index a58fb52..06a5208 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
r83-mark-tables-as-static-constants.patch
r84-normalisation-factor-sqrt2+output-bias.patch
+r87-sanity-check-for-subframes-and-prim_channels.patch
--
libdca packaging
More information about the pkg-multimedia-commits
mailing list