]> git.sesse.net Git - ffmpeg/commitdiff
avcodec/h264_slice: Check input SPS in ff_h264_update_thread_context()
authorMichael Niedermayer <michael@niedermayer.cc>
Sat, 20 Mar 2021 13:36:28 +0000 (14:36 +0100)
committerMichael Niedermayer <michael@niedermayer.cc>
Wed, 31 Mar 2021 21:09:35 +0000 (23:09 +0200)
Fixes: crash
Fixes: check_pkt.mp4
Found-by: Rafael Dutra <rafael.dutra@cispa.de>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavcodec/h264_slice.c

index 84b5710ab4178dadd9c6c7545792a23dac29cafe..62f7a61aed9af051c78ee6202f386c999c1dbd4b 100644 (file)
@@ -304,9 +304,8 @@ int ff_h264_update_thread_context(AVCodecContext *dst,
     if (dst == src)
         return 0;
 
-    // We can't fail if SPS isn't set at it breaks current skip_frame code
-    //if (!h1->ps.sps)
-    //    return AVERROR_INVALIDDATA;
+    if (inited && !h1->ps.sps)
+        return AVERROR_INVALIDDATA;
 
     if (inited &&
         (h->width                 != h1->width                 ||