RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-03-01 02:00:50 +00:00
Code Issues Projects Releases Wiki Activity

dont read over the end of a data chunk and at the end search for the next

Browse Source 
Originally committed as revision 5537 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2006-06-28 10:51:56 +00:00
parent e71bcc3798
commit b582d7ba4d
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libavformat/wav.c
View File

@ -203,6 +203,7 @@ int wav_codec_get_id(unsigned int tag, int bps)
#ifdef CONFIG_MUXERS #ifdef CONFIG_MUXERS
typedef struct { typedef struct {
offset_t data; offset_t data;
offset_t data_end;
} WAVContext; } WAVContext;
static int wav_write_header(AVFormatContext *s) static int wav_write_header(AVFormatContext *s)
@ -304,6 +305,7 @@ static int wav_read_header(AVFormatContext *s,
unsigned int tag; unsigned int tag;
ByteIOContext *pb = &s->pb; ByteIOContext *pb = &s->pb;
AVStream *st; AVStream *st;
WAVContext *wav = s->priv_data;
/* check RIFF header */ /* check RIFF header */
tag = get_le32(pb); tag = get_le32(pb);
@ -331,6 +333,7 @@ static int wav_read_header(AVFormatContext *s,
size = find_tag(pb, MKTAG('d', 'a', 't', 'a')); size = find_tag(pb, MKTAG('d', 'a', 't', 'a'));
if (size < 0) if (size < 0)
return -1; return -1;
wav->data_end= url_ftell(pb) + size;
return 0; return 0;
} }
@ -339,19 +342,30 @@ static int wav_read_header(AVFormatContext *s,
static int wav_read_packet(AVFormatContext *s, static int wav_read_packet(AVFormatContext *s,
AVPacket *pkt) AVPacket *pkt)
{ {
int ret, size; int ret, size, left;
AVStream *st; AVStream *st;
WAVContext *wav = s->priv_data;
if (url_feof(&s->pb)) if (url_feof(&s->pb))
return AVERROR_IO; return AVERROR_IO;
st = s->streams[0]; st = s->streams[0];
left= wav->data_end - url_ftell(&s->pb);
if(left <= 0){
left = find_tag(&(s->pb), MKTAG('d', 'a', 't', 'a'));
if (left < 0) {
return AVERROR_IO;
}
wav->data_end= url_ftell(&s->pb) + left;
}
size = MAX_SIZE; size = MAX_SIZE;
if (st->codec->block_align > 1) { if (st->codec->block_align > 1) {
if (size < st->codec->block_align) if (size < st->codec->block_align)
size = st->codec->block_align; size = st->codec->block_align;
size = (size / st->codec->block_align) * st->codec->block_align; size = (size / st->codec->block_align) * st->codec->block_align;
} }
size= FFMIN(size, left);
if (av_new_packet(pkt, size)) if (av_new_packet(pkt, size))
return AVERROR_IO; return AVERROR_IO;
pkt->stream_index = 0; pkt->stream_index = 0;
@ -393,7 +407,7 @@ static int wav_read_seek(AVFormatContext *s,
static AVInputFormat wav_iformat = { static AVInputFormat wav_iformat = {
"wav", "wav",
"wav format", "wav format",
0, sizeof(WAVContext),
wav_probe, wav_probe,
wav_read_header, wav_read_header,
wav_read_packet, wav_read_packet,