summaryrefslogtreecommitdiff
path: root/user/vorbis-tools/vorbis-tools-cve9638-cve9639.patch
diff options
context:
space:
mode:
authorMax Rees <maxcrees@me.com>2020-11-22 00:29:45 -0500
committerMax Rees <maxcrees@me.com>2020-11-22 00:29:45 -0500
commit8961c23b4a0761e2dfc30143c0d54c1829843266 (patch)
tree29973b95db35d7e365a9977e9a96f3e8f0cde567 /user/vorbis-tools/vorbis-tools-cve9638-cve9639.patch
parentc264d8733292f1a1fd6d71c8fd0d0f8f257da557 (diff)
downloadpackages-8961c23b4a0761e2dfc30143c0d54c1829843266.tar.gz
packages-8961c23b4a0761e2dfc30143c0d54c1829843266.tar.bz2
packages-8961c23b4a0761e2dfc30143c0d54c1829843266.tar.xz
packages-8961c23b4a0761e2dfc30143c0d54c1829843266.zip
user/vorbis-tools: cleanup sec patches from upstream
https://gitlab.xiph.org/xiph/vorbis-tools
Diffstat (limited to 'user/vorbis-tools/vorbis-tools-cve9638-cve9639.patch')
-rw-r--r--user/vorbis-tools/vorbis-tools-cve9638-cve9639.patch77
1 files changed, 0 insertions, 77 deletions
diff --git a/user/vorbis-tools/vorbis-tools-cve9638-cve9639.patch b/user/vorbis-tools/vorbis-tools-cve9638-cve9639.patch
deleted file mode 100644
index 80238b741..000000000
--- a/user/vorbis-tools/vorbis-tools-cve9638-cve9639.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-... in order to prevent a division by zero (CVE-2014-9638) and integer
-overflow (CVE-2014-9639).
-
-Bug: https://trac.xiph.org/ticket/2136
-Bug: https://trac.xiph.org/ticket/2137
----
- oggenc/audio.c | 19 +++++++++++++++++--
- 1 file changed, 17 insertions(+), 2 deletions(-)
-
-diff --git a/oggenc/audio.c b/oggenc/audio.c
-index 477da8c..1167f1b 100644
---- a/oggenc/audio.c
-+++ b/oggenc/audio.c
-@@ -13,6 +13,7 @@
- #include <config.h>
- #endif
-
-+#include <limits.h>
- #include <stdlib.h>
- #include <stdio.h>
- #include <string.h>
-@@ -251,6 +252,7 @@ int aiff_open(FILE *in, oe_enc_opt *opt, unsigned char *buf, int buflen)
- aiff_fmt format;
- aifffile *aiff = malloc(sizeof(aifffile));
- int i;
-+ long channels;
-
- if(buf[11]=='C')
- aifc=1;
-@@ -277,11 +279,17 @@ int aiff_open(FILE *in, oe_enc_opt *opt, unsigned char *buf, int buflen)
- return 0;
- }
-
-- format.channels = READ_U16_BE(buffer);
-+ format.channels = channels = READ_U16_BE(buffer);
- format.totalframes = READ_U32_BE(buffer+2);
- format.samplesize = READ_U16_BE(buffer+6);
- format.rate = (int)read_IEEE80(buffer+8);
-
-+ if(channels <= 0L || SHRT_MAX < channels)
-+ {
-+ fprintf(stderr, _("Warning: Unsupported count of channels in AIFF header\n"));
-+ return 0;
-+ }
-+
- aiff->bigendian = 1;
-
- if(aifc)
-@@ -416,6 +424,7 @@ int wav_open(FILE *in, oe_enc_opt *opt, unsigned char *oldbuf, int buflen)
- wav_fmt format;
- wavfile *wav = malloc(sizeof(wavfile));
- int i;
-+ long channels;
-
- /* Ok. At this point, we know we have a WAV file. Now we have to detect
- * whether we support the subtype, and we have to find the actual data
-@@ -453,12 +462,18 @@ int wav_open(FILE *in, oe_enc_opt *opt, unsigned char *oldbuf, int buflen)
- }
-
- format.format = READ_U16_LE(buf);
-- format.channels = READ_U16_LE(buf+2);
-+ format.channels = channels = READ_U16_LE(buf+2);
- format.samplerate = READ_U32_LE(buf+4);
- format.bytespersec = READ_U32_LE(buf+8);
- format.align = READ_U16_LE(buf+12);
- format.samplesize = READ_U16_LE(buf+14);
-
-+ if(channels <= 0L || SHRT_MAX < channels)
-+ {
-+ fprintf(stderr, _("Warning: Unsupported count of channels in WAV header\n"));
-+ return 0;
-+ }
-+
- if(format.format == -2) /* WAVE_FORMAT_EXTENSIBLE */
- {
- if(len<40)
---