Commit 3bbabc06 authored by Petter Reinholdtsen's avatar Petter Reinholdtsen Committed by Thomas Daede

oggenc: validate count of channels in the header (CVE-2014-9638 & CVE-2014-9639)

Author: Kamil Dudka <kdudka@redhat.com>
Origin: http://lists.xiph.org/pipermail/vorbis-dev/2015-February/020423.html
Bug: https://trac.xiph.org/ticket/2136
Bug: https://trac.xiph.org/ticket/2137
Bug-Debian: https://bugs.debian.org/776086
Forwarded: not-needed
Reviewed-By: Petter Reinholdtsen's avatarPetter Reinholdtsen <pere@hungry.com>
Last-Update: 2015-09-22
parent c1059cd1
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
#include <config.h> #include <config.h>
#endif #endif
#include <limits.h>
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
...@@ -251,6 +252,7 @@ int aiff_open(FILE *in, oe_enc_opt *opt, unsigned char *buf, int buflen) ...@@ -251,6 +252,7 @@ int aiff_open(FILE *in, oe_enc_opt *opt, unsigned char *buf, int buflen)
aiff_fmt format; aiff_fmt format;
aifffile *aiff = malloc(sizeof(aifffile)); aifffile *aiff = malloc(sizeof(aifffile));
int i; int i;
long channels;
if(buf[11]=='C') if(buf[11]=='C')
aifc=1; aifc=1;
...@@ -277,11 +279,16 @@ int aiff_open(FILE *in, oe_enc_opt *opt, unsigned char *buf, int buflen) ...@@ -277,11 +279,16 @@ int aiff_open(FILE *in, oe_enc_opt *opt, unsigned char *buf, int buflen)
return 0; return 0;
} }
format.channels = READ_U16_BE(buffer); format.channels = channels = READ_U16_BE(buffer);
format.totalframes = READ_U32_BE(buffer+2); format.totalframes = READ_U32_BE(buffer+2);
format.samplesize = READ_U16_BE(buffer+6); format.samplesize = READ_U16_BE(buffer+6);
format.rate = (int)read_IEEE80(buffer+8); 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; aiff->bigendian = 1;
if(aifc) if(aifc)
...@@ -416,6 +423,7 @@ int wav_open(FILE *in, oe_enc_opt *opt, unsigned char *oldbuf, int buflen) ...@@ -416,6 +423,7 @@ int wav_open(FILE *in, oe_enc_opt *opt, unsigned char *oldbuf, int buflen)
wav_fmt format; wav_fmt format;
wavfile *wav = malloc(sizeof(wavfile)); wavfile *wav = malloc(sizeof(wavfile));
int i; int i;
long channels;
/* Ok. At this point, we know we have a WAV file. Now we have to detect /* 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 * whether we support the subtype, and we have to find the actual data
...@@ -453,12 +461,18 @@ int wav_open(FILE *in, oe_enc_opt *opt, unsigned char *oldbuf, int buflen) ...@@ -453,12 +461,18 @@ int wav_open(FILE *in, oe_enc_opt *opt, unsigned char *oldbuf, int buflen)
} }
format.format = READ_U16_LE(buf); 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.samplerate = READ_U32_LE(buf+4);
format.bytespersec = READ_U32_LE(buf+8); format.bytespersec = READ_U32_LE(buf+8);
format.align = READ_U16_LE(buf+12); format.align = READ_U16_LE(buf+12);
format.samplesize = READ_U16_LE(buf+14); 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(format.format == -2) /* WAVE_FORMAT_EXTENSIBLE */
{ {
if(len<40) if(len<40)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment