[FFmpeg-devel] [PATCH 1/4] avfilter/vf_signalstats: Use 64bit for processing histogram

[FFmpeg-devel] [PATCH 1/4] avfilter/vf_signalstats: Use 64bit for processing histogram

[Andreas Rheinhardt]

The result might not fit into 32bit if an image has gigantic
dimensions and one of the planes has a dominant value
(particularly so if said value is big).

Fixes Coverity issues #1598399, #1598401, #1598402, #1598403, #1598404.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 libavfilter/vf_signalstats.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/libavfilter/vf_signalstats.c b/libavfilter/vf_signalstats.c
index 50c9df4298..78a23bb705 100644
--- a/libavfilter/vf_signalstats.c
+++ b/libavfilter/vf_signalstats.c
@@ -721,10 +721,10 @@ static int filter_frame(AVFilterLink *link, AVFrame *in)
         if (histv[fil])   maxv   = fil;
         if (histsat[fil]) maxsat = fil;
 
-        toty   += histy[fil]   * fil;
-        totu   += histu[fil]   * fil;
-        totv   += histv[fil]   * fil;
-        totsat += histsat[fil] * fil;
+        toty   += (uint64_t)histy[fil]   * fil;
+        totu   += (uint64_t)histu[fil]   * fil;
+        totv   += (uint64_t)histv[fil]   * fil;
+        totsat += (uint64_t)histsat[fil] * fil;
 
         accy   += histy[fil];
         accu   += histu[fil];
@@ -745,7 +745,7 @@ static int filter_frame(AVFilterLink *link, AVFrame *in)
     maxhue = histhue[0];
     medhue = -1;
     for (fil = 0; fil < 360; fil++) {
-        tothue += histhue[fil] * fil;
+        tothue += (uint64_t)histhue[fil] * fil;
         acchue += histhue[fil];
 
         if (medhue == -1 && acchue > s->cfs / 2)
-- 
2.40.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/4] avformat/matroskadec: Add assert to silence Coverity false positive

[Andreas Rheinhardt]

Helps with Coverity issue #1452453.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 libavformat/matroskadec.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
index 2f07e11d87..13959f8b3d 100644
--- a/libavformat/matroskadec.c
+++ b/libavformat/matroskadec.c
@@ -1315,6 +1315,8 @@ static int ebml_parse(MatroskaDemuxContext *matroska,
                     matroska->num_levels--;
                     return LEVEL_ENDED;
                 }
+                // We have not encountered a known element; syntax is a sentinel.
+                av_assert1(syntax->type == EBML_NONE);
             };
         }
 
-- 
2.40.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/4] avfilter/af_aiir: Remove dead code

[Andreas Rheinhardt]

Fixes Coverity issue #1468252.

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

diff --git a/libavfilter/af_aiir.c b/libavfilter/af_aiir.c
index b5e5b41db6..324fc367a3 100644
--- a/libavfilter/af_aiir.c
+++ b/libavfilter/af_aiir.c
@@ -820,7 +820,6 @@ static void solve(double *matrix, double *vector, int n, double *y, double *x, d
 static int convert_serial2parallel(AVFilterContext *ctx, int channels)
 {
     AudioIIRContext *s = ctx->priv;
-    int ret = 0;
 
     for (int ch = 0; ch < channels; ch++) {
         IIRChannel *iir = &s->iir[ch];
@@ -879,9 +878,6 @@ static int convert_serial2parallel(AVFilterContext *ctx, int channels)
         av_free(resp);
         av_free(M);
         av_free(W);
-
-        if (ret < 0)
-            return ret;
     }
 
     return 0;
-- 
2.40.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 4/4] avfilter/af_aiir: Avoid unchecked allocation

[Andreas Rheinhardt]

W has not been checked at all; allocate it jointly with M
to fix this.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 libavfilter/af_aiir.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/libavfilter/af_aiir.c b/libavfilter/af_aiir.c
index 324fc367a3..7bd9e37e43 100644
--- a/libavfilter/af_aiir.c
+++ b/libavfilter/af_aiir.c
@@ -828,17 +828,17 @@ static int convert_serial2parallel(AVFilterContext *ctx, int channels)
         double *impulse = av_calloc(length, sizeof(*impulse));
         double *y = av_calloc(length, sizeof(*y));
         double *resp = av_calloc(length, sizeof(*resp));
-        double *M = av_calloc((length - 1) * 2 * nb_biquads, sizeof(*M));
-        double *W = av_calloc((length - 1) * 2 * nb_biquads, sizeof(*W));
+        double *M = av_calloc((length - 1) * nb_biquads, 2 * 2 * sizeof(*M));
+        double *W;
 
         if (!impulse || !y || !resp || !M) {
             av_free(impulse);
             av_free(y);
             av_free(resp);
             av_free(M);
-            av_free(W);
             return AVERROR(ENOMEM);
         }
+        W = M + (length - 1) * 2 * nb_biquads;
 
         impulse[0] = 1.;
 
@@ -877,7 +877,6 @@ static int convert_serial2parallel(AVFilterContext *ctx, int channels)
         av_free(y);
         av_free(resp);
         av_free(M);
-        av_free(W);
     }
 
     return 0;
-- 
2.40.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/4] avfilter/vf_signalstats: Use 64bit for processing histogram

[Andreas Rheinhardt]

Andreas Rheinhardt:
> The result might not fit into 32bit if an image has gigantic
> dimensions and one of the planes has a dominant value
> (particularly so if said value is big).
> 
> Fixes Coverity issues #1598399, #1598401, #1598402, #1598403, #1598404.
> 
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
> ---
>  libavfilter/vf_signalstats.c | 10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/libavfilter/vf_signalstats.c b/libavfilter/vf_signalstats.c
> index 50c9df4298..78a23bb705 100644
> --- a/libavfilter/vf_signalstats.c
> +++ b/libavfilter/vf_signalstats.c
> @@ -721,10 +721,10 @@ static int filter_frame(AVFilterLink *link, AVFrame *in)
>          if (histv[fil])   maxv   = fil;
>          if (histsat[fil]) maxsat = fil;
>  
> -        toty   += histy[fil]   * fil;
> -        totu   += histu[fil]   * fil;
> -        totv   += histv[fil]   * fil;
> -        totsat += histsat[fil] * fil;
> +        toty   += (uint64_t)histy[fil]   * fil;
> +        totu   += (uint64_t)histu[fil]   * fil;
> +        totv   += (uint64_t)histv[fil]   * fil;
> +        totsat += (uint64_t)histsat[fil] * fil;
>  
>          accy   += histy[fil];
>          accu   += histu[fil];
> @@ -745,7 +745,7 @@ static int filter_frame(AVFilterLink *link, AVFrame *in)
>      maxhue = histhue[0];
>      medhue = -1;
>      for (fil = 0; fil < 360; fil++) {
> -        tothue += histhue[fil] * fil;
> +        tothue += (uint64_t)histhue[fil] * fil;
>          acchue += histhue[fil];
>  
>          if (medhue == -1 && acchue > s->cfs / 2)

Will apply this patchset tomorrow unless there are objections.

- Andreas

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