[FFmpeg-cvslog] avcodec/h2645_parse: Avoid EAGAIN
Michael Niedermayer
git at videolan.org
Sun Apr 14 23:58:46 EEST 2024
ffmpeg | branch: release/3.4 | Michael Niedermayer <michael at niedermayer.cc> | Sun Oct 1 19:28:55 2023 +0200| [a31de889eae5613466ef5c6592cbf2d916146021] | committer: Michael Niedermayer
avcodec/h2645_parse: Avoid EAGAIN
EAGAIN causes an assertion failure when it is returned from the decoder
Fixes: Assertion consumed != (-(11)) failed at libavcodec/decode.c:462
Fixes: assertion_IOT_instruction_decode_c_462/poc
Found-by: Hardik Shah of Vehere (Dawn Treaders team)
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
(cherry picked from commit 5ddab49d48343385eadb3a435a5491c476b66ecc)
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a31de889eae5613466ef5c6592cbf2d916146021
---
libavcodec/h2645_parse.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavcodec/h2645_parse.h b/libavcodec/h2645_parse.h
index 5f3e17a0f2..ca615d9f1b 100644
--- a/libavcodec/h2645_parse.h
+++ b/libavcodec/h2645_parse.h
@@ -97,7 +97,7 @@ static inline int get_nalsize(int nal_length_size, const uint8_t *buf,
if (*buf_index >= buf_size - nal_length_size) {
// the end of the buffer is reached, refill it
- return AVERROR(EAGAIN);
+ return AVERROR_INVALIDDATA;
}
for (i = 0; i < nal_length_size; i++)
More information about the ffmpeg-cvslog
mailing list