PR #22681 opened by Zhao Zhili (quink) URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/22681 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/22681.patch
Signed-off-by: Zhao Zhili <[email protected]> >From 42aba5df95491baf69a5fb50fafd827beb6c2f3f Mon Sep 17 00:00:00 2001 From: Zhao Zhili <[email protected]> Date: Wed, 1 Apr 2026 21:09:47 +0800 Subject: [PATCH] avformat/matroskadec: avoid calling get_bytes_left() three times with the same state Signed-off-by: Zhao Zhili <[email protected]> --- libavformat/matroskadec.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 64bea7969e..1900a93210 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -3978,15 +3978,15 @@ static int matroska_parse_block_additional(MatroskaDemuxContext *matroska, switch (provider_code) { case ITU_T_T35_PROVIDER_CODE_VNOVA: { uint8_t *data; + int left = bytestream2_get_bytes_left(&bc); - if (bytestream2_get_bytes_left(&bc) < 2) + if (left < 2) return AVERROR_INVALIDDATA; - - data = av_packet_new_side_data(pkt, AV_PKT_DATA_LCEVC, bytestream2_get_bytes_left(&bc)); + data = av_packet_new_side_data(pkt, AV_PKT_DATA_LCEVC, left); if (!data) return AVERROR(ENOMEM); - bytestream2_get_bufferu(&bc, data, bytestream2_get_bytes_left(&bc)); + bytestream2_get_bufferu(&bc, data, left); return 0; } -- 2.52.0 _______________________________________________ ffmpeg-devel mailing list -- [email protected] To unsubscribe send an email to [email protected]
