Browse Source

ogg: prevent NULL pointer deference in theora gptopts

Additional safety in case a special ogg stream is crafted
with the proper number of

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
tags/n1.0
Michael Niedermayer Luca Barbato 14 years ago
parent
commit
bb146bb57b
1 changed files with 7 additions and 2 deletions
  1. +7
    -2
      libavformat/oggparsetheora.c

+ 7
- 2
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++;


Loading…
Cancel
Save