MrBesen/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

vorbisdemux: Check private context in theoras gtopts.

Browse Source 
This prevents a null ptr dereference.
It could be checked differently but this way it should
be possible to return some data.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-03-23 03:43:30 +01:00
parent ae2c33b0c2
commit f927c5b753
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavformat/oggparseskeleton.c
View File

@ -74,8 +74,11 @@ static int skeleton_header(AVFormatContext *s, int idx)
target_idx = ogg_find_stream(ogg, AV_RL32(buf+12));
start_granule = AV_RL64(buf+36);
if (target_idx >= 0 && start_granule != -1) {
int64_t pts = ogg_gptopts(s, target_idx, start_granule, NULL);
if (pts == AV_NOPTS_VALUE)
return -1;
ogg->streams[target_idx].lastpts =
s->streams[target_idx]->start_time = ogg_gptopts(s, target_idx, start_granule, NULL);
s->streams[target_idx]->start_time = pts;
}
}

9
libavformat/oggparsetheora.c
View File

@ -131,8 +131,13 @@ theora_gptopts(AVFormatContext *ctx, int idx, uint64_t gp, int64_t *dts)
struct ogg *ogg = ctx->priv_data;
struct ogg_stream *os = ogg->streams + idx;
struct theora_params *thp = os->private;
uint64_t iframe = gp >> thp->gpshift;
uint64_t pframe = gp & thp->gpmask;
uint64_t iframe, pframe;
if (!thp)
return AV_NOPTS_VALUE;
iframe = gp >> thp->gpshift;
pframe = gp & thp->gpmask;
if (thp->version < 0x030201)
iframe++;