[SCM] sox/master: Drop unused patches.
mira-guest at users.alioth.debian.org
mira-guest at users.alioth.debian.org
Sun Nov 5 21:17:17 UTC 2017
The following commit has been merged in the master branch:
commit b33ae462d526d00ab0d368a21076b77bfb344f0c
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date: Sun Nov 5 21:52:50 2017 +0100
Drop unused patches.
diff --git a/debian/patches/0001-Check-for-minimum-size-sphere-headers.patch b/debian/patches/0001-Check-for-minimum-size-sphere-headers.patch
deleted file mode 100644
index 7cb8042..0000000
--- a/debian/patches/0001-Check-for-minimum-size-sphere-headers.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/sphere.c.old
-+++ src/sphere.c
-@@ -47,6 +47,11 @@ static int start_read(sox_format_t * ft)
-
- /* Determine header size, and allocate a buffer large enough to hold it. */
- sscanf(fldsval, "%lu", &header_size_ul);
-+ if (header_size_ul < 16) {
-+ lsx_fail_errno(ft, SOX_EHDR, "Error reading Sphere header");
-+ return (SOX_EOF);
-+ }
-+
- buf = lsx_malloc(header_size = header_size_ul);
-
- /* Skip what we have read so far */
diff --git a/debian/patches/0002-More-checks-for-invalid-MS-ADPCM-blocks.patch b/debian/patches/0002-More-checks-for-invalid-MS-ADPCM-blocks.patch
deleted file mode 100644
index 23c931c..0000000
--- a/debian/patches/0002-More-checks-for-invalid-MS-ADPCM-blocks.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/wav.c.old
-+++ src/wav.c
-@@ -166,7 +166,7 @@ static unsigned short AdpcmReadBlock(sox_format_t * ft)
- /* work with partial blocks. Specs say it should be null */
- /* padded but I guess this is better than trailing quiet. */
- samplesThisBlock = lsx_ms_adpcm_samples_in((size_t)0, (size_t)ft->signal.channels, bytesRead, (size_t)0);
-- if (samplesThisBlock == 0)
-+ if (samplesThisBlock == 0 || samplesThisBlock > wav->samplesPerBlock)
- {
- lsx_warn("Premature EOF on .wav input file");
- return 0;
--
sox packaging
More information about the pkg-multimedia-commits
mailing list