Commit 022f0b7c authored by Ronald S. Bultje's avatar Ronald S. Bultje
Browse files

Do not access s->gb directly in functions that have a local copy of that

variable. See "[PATCH] asf.c: don't access AVFormatContext->pb" thread on
ML.

Originally committed as revision 16023 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 2ceccf04
......@@ -567,7 +567,7 @@ static int asf_get_packet(AVFormatContext *s)
int rsize = 8;
int c, d, e, off;
off= (url_ftell(s->pb) - s->data_offset) % asf->packet_size + 3;
off= (url_ftell(pb) - s->data_offset) % asf->packet_size + 3;
c=d=e=-1;
while(off-- > 0){
......@@ -723,7 +723,7 @@ static int asf_read_packet(AVFormatContext *s, AVPacket *pkt)
/* fail safe */
url_fskip(pb, ret);
asf->packet_pos= url_ftell(s->pb);
asf->packet_pos= url_ftell(pb);
if (asf->data_object_size != (uint64_t)-1 &&
(asf->packet_pos - asf->data_object_offset >= asf->data_object_size))
return AVERROR(EIO); /* Do not exceed the size of the data object */
......
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