[FFmpeg-devel] [PATCH 1/3] avcodec/evc_ps: Fix size of tile_(row|column) arrays

[FFmpeg-devel] [PATCH 1/3] avcodec/evc_ps: Fix size of tile_(row|column) arrays

[Andreas Rheinhardt]

Prevents out-of-bound writes when parsing tile row heights.
Fixes Coverity issue #1538300.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 libavcodec/evc_ps.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavcodec/evc_ps.h b/libavcodec/evc_ps.h
index 0bbec1f138..336953b176 100644
--- a/libavcodec/evc_ps.h
+++ b/libavcodec/evc_ps.h
@@ -192,8 +192,8 @@ typedef struct EVCParserPPS {
     uint32_t num_tile_columns_minus1;                              // ue(v)
     uint32_t num_tile_rows_minus1;                                 // ue(v)
     uint8_t uniform_tile_spacing_flag;                             // u(1)
-    uint32_t tile_column_width_minus1[EVC_MAX_TILE_ROWS];          // ue(v)
-    uint32_t tile_row_height_minus1[EVC_MAX_TILE_COLUMNS];         // ue(v)
+    uint32_t tile_column_width_minus1[EVC_MAX_TILE_COLUMNS];       // ue(v)
+    uint32_t tile_row_height_minus1[EVC_MAX_TILE_ROWS];            // ue(v)
     uint8_t loop_filter_across_tiles_enabled_flag;                 // u(1)
     uint32_t tile_offset_len_minus1;                               // ue(v)
     uint8_t tile_id_len_minus1;                                    // ue(v)
-- 
2.34.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".

[FFmpeg-devel] [PATCH 2/3] fftools/ffmpeg_enc: Remove always-true checks

[Andreas Rheinhardt]

frame is always != NULL for audio and video here
(this is checked by an assert and the frame is already dereferenced
before it reaches this code here).
Fixes Coverity issue #1538858.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 fftools/ffmpeg_enc.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/fftools/ffmpeg_enc.c b/fftools/ffmpeg_enc.c
index 1489b2f179..2c7e29af24 100644
--- a/fftools/ffmpeg_enc.c
+++ b/fftools/ffmpeg_enc.c
@@ -304,20 +304,17 @@ int enc_open(OutputStream *ost, AVFrame *frame)
             enc_ctx->bits_per_raw_sample = FFMIN(fd->bits_per_raw_sample,
                                                  av_pix_fmt_desc_get(enc_ctx->pix_fmt)->comp[0].depth);
 
-        if (frame) {
             enc_ctx->color_range            = frame->color_range;
             enc_ctx->color_primaries        = frame->color_primaries;
             enc_ctx->color_trc              = frame->color_trc;
             enc_ctx->colorspace             = frame->colorspace;
             enc_ctx->chroma_sample_location = frame->chroma_location;
-        }
 
         enc_ctx->framerate = fr;
 
         ost->st->avg_frame_rate = fr;
 
         // Field order: autodetection
-        if (frame) {
             if (enc_ctx->flags & (AV_CODEC_FLAG_INTERLACED_DCT | AV_CODEC_FLAG_INTERLACED_ME) &&
                 ost->top_field_first >= 0)
                 if (ost->top_field_first)
@@ -332,7 +329,6 @@ int enc_open(OutputStream *ost, AVFrame *frame)
                     enc_ctx->field_order = (frame->flags & AV_FRAME_FLAG_TOP_FIELD_FIRST) ? AV_FIELD_TB:AV_FIELD_BT;
             } else
                 enc_ctx->field_order = AV_FIELD_PROGRESSIVE;
-        }
 
         // Field order: override
         if (ost->top_field_first == 0) {
-- 
2.34.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".

[FFmpeg-devel] [PATCH 3/3] fftools/ffmpeg_enc: Reindentate after the last commit

[Andreas Rheinhardt]

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 fftools/ffmpeg_enc.c | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/fftools/ffmpeg_enc.c b/fftools/ffmpeg_enc.c
index 2c7e29af24..8b750de4e5 100644
--- a/fftools/ffmpeg_enc.c
+++ b/fftools/ffmpeg_enc.c
@@ -304,31 +304,31 @@ int enc_open(OutputStream *ost, AVFrame *frame)
             enc_ctx->bits_per_raw_sample = FFMIN(fd->bits_per_raw_sample,
                                                  av_pix_fmt_desc_get(enc_ctx->pix_fmt)->comp[0].depth);
 
-            enc_ctx->color_range            = frame->color_range;
-            enc_ctx->color_primaries        = frame->color_primaries;
-            enc_ctx->color_trc              = frame->color_trc;
-            enc_ctx->colorspace             = frame->colorspace;
-            enc_ctx->chroma_sample_location = frame->chroma_location;
+        enc_ctx->color_range            = frame->color_range;
+        enc_ctx->color_primaries        = frame->color_primaries;
+        enc_ctx->color_trc              = frame->color_trc;
+        enc_ctx->colorspace             = frame->colorspace;
+        enc_ctx->chroma_sample_location = frame->chroma_location;
 
         enc_ctx->framerate = fr;
 
         ost->st->avg_frame_rate = fr;
 
         // Field order: autodetection
-            if (enc_ctx->flags & (AV_CODEC_FLAG_INTERLACED_DCT | AV_CODEC_FLAG_INTERLACED_ME) &&
-                ost->top_field_first >= 0)
-                if (ost->top_field_first)
-                    frame->flags |= AV_FRAME_FLAG_TOP_FIELD_FIRST;
-                else
-                    frame->flags &= ~AV_FRAME_FLAG_TOP_FIELD_FIRST;
-
-            if (frame->flags & AV_FRAME_FLAG_INTERLACED) {
-                if (enc->id == AV_CODEC_ID_MJPEG)
-                    enc_ctx->field_order = (frame->flags & AV_FRAME_FLAG_TOP_FIELD_FIRST) ? AV_FIELD_TT:AV_FIELD_BB;
-                else
-                    enc_ctx->field_order = (frame->flags & AV_FRAME_FLAG_TOP_FIELD_FIRST) ? AV_FIELD_TB:AV_FIELD_BT;
-            } else
-                enc_ctx->field_order = AV_FIELD_PROGRESSIVE;
+        if (enc_ctx->flags & (AV_CODEC_FLAG_INTERLACED_DCT | AV_CODEC_FLAG_INTERLACED_ME) &&
+            ost->top_field_first >= 0)
+            if (ost->top_field_first)
+                frame->flags |= AV_FRAME_FLAG_TOP_FIELD_FIRST;
+            else
+                frame->flags &= ~AV_FRAME_FLAG_TOP_FIELD_FIRST;
+
+        if (frame->flags & AV_FRAME_FLAG_INTERLACED) {
+            if (enc->id == AV_CODEC_ID_MJPEG)
+                enc_ctx->field_order = (frame->flags & AV_FRAME_FLAG_TOP_FIELD_FIRST) ? AV_FIELD_TT:AV_FIELD_BB;
+            else
+                enc_ctx->field_order = (frame->flags & AV_FRAME_FLAG_TOP_FIELD_FIRST) ? AV_FIELD_TB:AV_FIELD_BT;
+        } else
+            enc_ctx->field_order = AV_FIELD_PROGRESSIVE;
 
         // Field order: override
         if (ost->top_field_first == 0) {
-- 
2.34.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 1/3] avcodec/evc_ps: Fix size of tile_(row|column) arrays

[James Almer]

On 7/16/2023 11:22 AM, Andreas Rheinhardt wrote:
> Prevents out-of-bound writes when parsing tile row heights.
> Fixes Coverity issue #1538300.
> 
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
> ---
>   libavcodec/evc_ps.h | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/libavcodec/evc_ps.h b/libavcodec/evc_ps.h
> index 0bbec1f138..336953b176 100644
> --- a/libavcodec/evc_ps.h
> +++ b/libavcodec/evc_ps.h
> @@ -192,8 +192,8 @@ typedef struct EVCParserPPS {
>       uint32_t num_tile_columns_minus1;                              // ue(v)
>       uint32_t num_tile_rows_minus1;                                 // ue(v)
>       uint8_t uniform_tile_spacing_flag;                             // u(1)
> -    uint32_t tile_column_width_minus1[EVC_MAX_TILE_ROWS];          // ue(v)
> -    uint32_t tile_row_height_minus1[EVC_MAX_TILE_COLUMNS];         // ue(v)
> +    uint32_t tile_column_width_minus1[EVC_MAX_TILE_COLUMNS];       // ue(v)
> +    uint32_t tile_row_height_minus1[EVC_MAX_TILE_ROWS];            // ue(v)
>       uint8_t loop_filter_across_tiles_enabled_flag;                 // u(1)
>       uint32_t tile_offset_len_minus1;                               // ue(v)
>       uint8_t tile_id_len_minus1;                                    // ue(v)

LGTM.
_______________________________________________
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 2/3] fftools/ffmpeg_enc: Remove always-true checks

[Anton Khirnov]

Quoting Andreas Rheinhardt (2023-07-16 16:24:35)
> frame is always != NULL for audio and video here
> (this is checked by an assert and the frame is already dereferenced
> before it reaches this code here).
> Fixes Coverity issue #1538858.
> 
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
> ---
>  fftools/ffmpeg_enc.c | 4 ----
>  1 file changed, 4 deletions(-)

This and the next patch look ok.

Thanks,
-- 
Anton Khirnov
_______________________________________________
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".