[FFmpeg-devel] [PATCH v2 2/2] avcodec/hevc_mp4toannexb: check bytes left for nalu_len

[FFmpeg-devel] [PATCH v2 2/2] avcodec/hevc_mp4toannexb: check bytes left for nalu_len

[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".

Re: [FFmpeg-devel] [PATCH v2 2/2] avcodec/hevc_mp4toannexb: check bytes left for nalu_len

[Martin Storsjö]

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".

Re: [FFmpeg-devel] [PATCH v2 2/2] avcodec/hevc_mp4toannexb: check bytes left for nalu_len

[Nuo Mi]

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".