diff mbox series

[FFmpeg-devel,7/7] tools/enc_recon_frame_test: Assert that av_image_get_linesize() succeeds

Message ID 20240521024652.1006233-7-michael@niedermayer.cc
State New
Headers show
Series [FFmpeg-devel,1/7] avutil/random_seed: Avoid dead returns | expand

Checks

Context Check Description
yinshiyou/make_loongarch64 success Make finished
yinshiyou/make_fate_loongarch64 success Make fate finished

Commit Message

Michael Niedermayer May 21, 2024, 2:46 a.m. UTC
Helps: CID1524598 Improper use of negative value

Sponsored-by: Sovereign Tech Fund
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
 tools/enc_recon_frame_test.c | 3 +++
 1 file changed, 3 insertions(+)

Comments

Andreas Rheinhardt May 21, 2024, 8:07 a.m. UTC | #1
Michael Niedermayer:
> Helps: CID1524598 Improper use of negative value
> 
> Sponsored-by: Sovereign Tech Fund
> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> ---
>  tools/enc_recon_frame_test.c | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/tools/enc_recon_frame_test.c b/tools/enc_recon_frame_test.c
> index c099beb3f4b..d39d6303c2e 100644
> --- a/tools/enc_recon_frame_test.c
> +++ b/tools/enc_recon_frame_test.c
> @@ -28,6 +28,7 @@
>  #include "decode_simple.h"
>  
>  #include "libavutil/adler32.h"
> +#include "libavutil/avassert.h"
>  #include "libavutil/common.h"
>  #include "libavutil/error.h"
>  #include "libavutil/frame.h"
> @@ -89,6 +90,8 @@ static int frame_hash(FrameChecksum **pc, size_t *nb_c, int64_t ts,
>          int linesize = av_image_get_linesize(frame->format, frame->width, p);
>          uint32_t checksum = 0;
>  
> +        av_assert1(linesize >= 0);
> +

This is a test tool; it should always be picky.

>          for (int j = 0; j < frame->height >> shift_v[p]; j++) {
>              checksum = av_adler32_update(checksum, data, linesize);
>              data += frame->linesize[p];
Michael Niedermayer May 27, 2024, 11:42 p.m. UTC | #2
On Tue, May 21, 2024 at 10:07:56AM +0200, Andreas Rheinhardt wrote:
> Michael Niedermayer:
> > Helps: CID1524598 Improper use of negative value
> > 
> > Sponsored-by: Sovereign Tech Fund
> > Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> > ---
> >  tools/enc_recon_frame_test.c | 3 +++
> >  1 file changed, 3 insertions(+)
> > 
> > diff --git a/tools/enc_recon_frame_test.c b/tools/enc_recon_frame_test.c
> > index c099beb3f4b..d39d6303c2e 100644
> > --- a/tools/enc_recon_frame_test.c
> > +++ b/tools/enc_recon_frame_test.c
> > @@ -28,6 +28,7 @@
> >  #include "decode_simple.h"
> >  
> >  #include "libavutil/adler32.h"
> > +#include "libavutil/avassert.h"
> >  #include "libavutil/common.h"
> >  #include "libavutil/error.h"
> >  #include "libavutil/frame.h"
> > @@ -89,6 +90,8 @@ static int frame_hash(FrameChecksum **pc, size_t *nb_c, int64_t ts,
> >          int linesize = av_image_get_linesize(frame->format, frame->width, p);
> >          uint32_t checksum = 0;
> >  
> > +        av_assert1(linesize >= 0);
> > +
> 
> This is a test tool; it should always be picky.

will apply with av_assert0()

thx

[...]
diff mbox series

Patch

diff --git a/tools/enc_recon_frame_test.c b/tools/enc_recon_frame_test.c
index c099beb3f4b..d39d6303c2e 100644
--- a/tools/enc_recon_frame_test.c
+++ b/tools/enc_recon_frame_test.c
@@ -28,6 +28,7 @@ 
 #include "decode_simple.h"
 
 #include "libavutil/adler32.h"
+#include "libavutil/avassert.h"
 #include "libavutil/common.h"
 #include "libavutil/error.h"
 #include "libavutil/frame.h"
@@ -89,6 +90,8 @@  static int frame_hash(FrameChecksum **pc, size_t *nb_c, int64_t ts,
         int linesize = av_image_get_linesize(frame->format, frame->width, p);
         uint32_t checksum = 0;
 
+        av_assert1(linesize >= 0);
+
         for (int j = 0; j < frame->height >> shift_v[p]; j++) {
             checksum = av_adler32_update(checksum, data, linesize);
             data += frame->linesize[p];