OSDN Git Service

avcodec/hevc_ps: check that VPS referenced from SPS exists
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 6 Jan 2014 01:51:20 +0000 (02:51 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 6 Jan 2014 03:30:04 +0000 (04:30 +0100)
This matches how its done for SPS/PPS.
An alternative to this is to check it when its used.

Fixes null pointer dereference
Fixes: signal_sigsegv_e30a43_1437_CIP_A_Panasonic_3.bit
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/hevc_ps.c

index 6950027..1684d77 100644 (file)
@@ -635,6 +635,12 @@ int ff_hevc_decode_nal_sps(HEVCContext *s)
         goto err;
     }
 
+    if (!s->vps_list[sps->vps_id]) {
+        av_log(s->avctx, AV_LOG_ERROR, "VPS does not exist \n");
+        ret = AVERROR_INVALIDDATA;
+        goto err;
+    }
+
     sps->max_sub_layers = get_bits(gb, 3) + 1;
     if (sps->max_sub_layers > MAX_SUB_LAYERS) {
         av_log(s->avctx, AV_LOG_ERROR, "sps_max_sub_layers out of range: %d\n",