aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-11-03 01:53:19 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-11-03 02:19:28 +0100
commit8a701ef7ddbb2d80ef77b14287d286fc9760f131 (patch)
tree853819f952d81a470a67671144e1645ee53c01c6
parent63a37d0e1ec59377af9fb7973ffc847f928ba851 (diff)
downloadffmpeg-8a701ef7ddbb2d80ef77b14287d286fc9760f131.tar.gz
avcodec/hevc_sei: Fix null dereference in decode_pic_timing()
Fixes Ticket3106 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/hevc_sei.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/hevc_sei.c b/libavcodec/hevc_sei.c
index a6a5dfc28b..1770eb52c4 100644
--- a/libavcodec/hevc_sei.c
+++ b/libavcodec/hevc_sei.c
@@ -78,10 +78,11 @@ static void decode_nal_sei_frame_packing_arrangement(HEVCContext *s)
static int decode_pic_timing(HEVCContext *s)
{
GetBitContext *gb = &s->HEVClc->gb;
- HEVCSPS *sps = (HEVCSPS*)s->sps_list[s->active_seq_parameter_set_id]->data;
+ HEVCSPS *sps;
- if (!sps)
+ if (!s->sps_list[s->active_seq_parameter_set_id])
return(AVERROR(ENOMEM));
+ sps = (HEVCSPS*)s->sps_list[s->active_seq_parameter_set_id]->data;
if (sps->vui.frame_field_info_present_flag) {
int pic_struct = get_bits(gb, 4);