summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2021-03-20 14:36:28 +0100
committerMichael Niedermayer <michael@niedermayer.cc>2021-03-31 23:09:35 +0200
commitceae92cb291c2536a93482cdf3c1ae3f7330b924 (patch)
tree4c7f3b3ed021a88049c0a7f31eebbbbd46b00c3f
parent76cea1d2ce3f23e8131c8664086a1daf873ed694 (diff)
avcodec/h264_slice: Check input SPS in ff_h264_update_thread_context()
Fixes: crash Fixes: check_pkt.mp4 Found-by: Rafael Dutra <rafael.dutra@cispa.de> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavcodec/h264_slice.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c
index 84b5710ab4..62f7a61aed 100644
--- a/libavcodec/h264_slice.c
+++ b/libavcodec/h264_slice.c
@@ -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 ||