* [FFmpeg-devel] [PATCH v2 2/2] avcodec/hevc_mp4toannexb: check bytes left for nalu_len [not found] <20240209111631.6026-1-nuomi2021@gmail.com> @ 2024-02-09 11:16 ` Nuo Mi 2024-02-09 11:47 ` Martin Storsjö 0 siblings, 1 reply; 3+ messages in thread From: Nuo Mi @ 2024-02-09 11:16 UTC (permalink / raw) To: ffmpeg-devel; +Cc: Nuo Mi similar issue as in the previous commit --- libavcodec/bsf/hevc_mp4toannexb.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libavcodec/bsf/hevc_mp4toannexb.c b/libavcodec/bsf/hevc_mp4toannexb.c index d91229a895..8eec18f31e 100644 --- a/libavcodec/bsf/hevc_mp4toannexb.c +++ b/libavcodec/bsf/hevc_mp4toannexb.c @@ -65,9 +65,11 @@ static int hevc_extradata_to_annexb(AVBSFContext *ctx) } for (j = 0; j < cnt; j++) { - int nalu_len = bytestream2_get_be16(&gb); + const int nalu_len = bytestream2_get_be16(&gb); - if (4 + AV_INPUT_BUFFER_PADDING_SIZE + nalu_len > SIZE_MAX - new_extradata_size) { + if (!nalu_len || + nalu_len > bytestream2_get_bytes_left(&gb) || + 4 + AV_INPUT_BUFFER_PADDING_SIZE + nalu_len > SIZE_MAX - new_extradata_size) { ret = AVERROR_INVALIDDATA; goto fail; } -- 2.25.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe". ^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [FFmpeg-devel] [PATCH v2 2/2] avcodec/hevc_mp4toannexb: check bytes left for nalu_len 2024-02-09 11:16 ` [FFmpeg-devel] [PATCH v2 2/2] avcodec/hevc_mp4toannexb: check bytes left for nalu_len Nuo Mi @ 2024-02-09 11:47 ` Martin Storsjö 2024-02-10 9:52 ` Nuo Mi 0 siblings, 1 reply; 3+ messages in thread From: Martin Storsjö @ 2024-02-09 11:47 UTC (permalink / raw) To: FFmpeg development discussions and patches; +Cc: Nuo Mi On Fri, 9 Feb 2024, Nuo Mi wrote: > similar issue as in the previous commit > --- > libavcodec/bsf/hevc_mp4toannexb.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) Keep in mind, that while the patches are posted together, they can end up at different places further in review, and in commits, so the commit messages should ideally be understandable standalone. // Martin _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe". ^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [FFmpeg-devel] [PATCH v2 2/2] avcodec/hevc_mp4toannexb: check bytes left for nalu_len 2024-02-09 11:47 ` Martin Storsjö @ 2024-02-10 9:52 ` Nuo Mi 0 siblings, 0 replies; 3+ messages in thread From: Nuo Mi @ 2024-02-10 9:52 UTC (permalink / raw) To: Martin Storsjö; +Cc: FFmpeg development discussions and patches On Fri, Feb 9, 2024 at 7:47 PM Martin Storsjö <martin@martin.st> wrote: > On Fri, 9 Feb 2024, Nuo Mi wrote: > > > similar issue as in the previous commit > > --- > > libavcodec/bsf/hevc_mp4toannexb.c | 6 ++++-- > > 1 file changed, 4 insertions(+), 2 deletions(-) > > Keep in mind, that while the patches are posted together, they can end up > at different places further in review, and in commits, so the commit > messages should ideally be understandable standalone. > Hi Martin Thank you for the reminder. Will do > > // Martin > > _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe". ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-02-10 9:52 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <20240209111631.6026-1-nuomi2021@gmail.com>
2024-02-09 11:16 ` [FFmpeg-devel] [PATCH v2 2/2] avcodec/hevc_mp4toannexb: check bytes left for nalu_len Nuo Mi
2024-02-09 11:47 ` Martin Storsjö
2024-02-10 9:52 ` Nuo Mi
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel This inbox may be cloned and mirrored by anyone: git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \ ffmpegdev@gitmailbox.com public-inbox-index ffmpegdev Example config snippet for mirrors. AGPL code for this site: git clone https://public-inbox.org/public-inbox.git