generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'qatar/master'

Browse Source 
* qatar/master:
  oggparsevorbis: return meaningful errors

Conflicts:
	libavformat/oggparsevorbis.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-10-06 12:24:13 +02:00
commit 4634871b51
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
libavformat/oggparsevorbis.c
View File

@ -80,12 +80,12 @@ int ff_vorbis_comment(AVFormatContext *as, AVDictionary **m,
/* must have vendor_length and user_comment_list_length */ /* must have vendor_length and user_comment_list_length */
if (size < 8) if (size < 8)
return -1; return AVERROR_INVALIDDATA;
s = bytestream_get_le32(&p); s = bytestream_get_le32(&p);
if (end - p - 4 < s || s < 0) if (end - p - 4 < s || s < 0)
return -1; return AVERROR_INVALIDDATA;
p += s; p += s;
@ -244,21 +244,21 @@ static int vorbis_header(AVFormatContext *s, int idx)
if (!os->private) { if (!os->private) {
os->private = av_mallocz(sizeof(struct oggvorbis_private)); os->private = av_mallocz(sizeof(struct oggvorbis_private));
if (!os->private) if (!os->private)
return -1; return AVERROR(ENOMEM);
} }
if (!(pkt_type & 1)) if (!(pkt_type & 1))
return 0; return 0;
if (os->psize < 1 || pkt_type > 5) if (os->psize < 1 || pkt_type > 5)
return -1; return AVERROR_INVALIDDATA;
priv = os->private; priv = os->private;
if (priv->packet[pkt_type >> 1]) if (priv->packet[pkt_type >> 1])
return -1; return AVERROR_INVALIDDATA;
if (pkt_type > 1 && !priv->packet[0] || pkt_type > 3 && !priv->packet[1]) if (pkt_type > 1 && !priv->packet[0] || pkt_type > 3 && !priv->packet[1])
return -1; return AVERROR_INVALIDDATA;
priv->len[pkt_type >> 1] = os->psize; priv->len[pkt_type >> 1] = os->psize;
priv->packet[pkt_type >> 1] = av_mallocz(os->psize); priv->packet[pkt_type >> 1] = av_mallocz(os->psize);
@ -272,10 +272,10 @@ static int vorbis_header(AVFormatContext *s, int idx)
int channels; int channels;
if (os->psize != 30) if (os->psize != 30)
return -1; return AVERROR_INVALIDDATA;
if (bytestream_get_le32(&p) != 0) /* vorbis_version */ if (bytestream_get_le32(&p) != 0) /* vorbis_version */
return -1; return AVERROR_INVALIDDATA;
channels = bytestream_get_byte(&p); channels = bytestream_get_byte(&p);
if (st->codec->channels && channels != st->codec->channels) { if (st->codec->channels && channels != st->codec->channels) {
@ -293,12 +293,12 @@ static int vorbis_header(AVFormatContext *s, int idx)
bs1 = blocksize >> 4; bs1 = blocksize >> 4;
if (bs0 > bs1) if (bs0 > bs1)
return -1; return AVERROR_INVALIDDATA;
if (bs0 < 6 || bs1 > 13) if (bs0 < 6 || bs1 > 13)
return -1; return AVERROR_INVALIDDATA;
if (bytestream_get_byte(&p) != 1) /* framing_flag */ if (bytestream_get_byte(&p) != 1) /* framing_flag */
return -1; return AVERROR_INVALIDDATA;
st->codec->codec_type = AVMEDIA_TYPE_AUDIO; st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
st->codec->codec_id = AV_CODEC_ID_VORBIS; st->codec->codec_id = AV_CODEC_ID_VORBIS;