[FFmpeg-devel] [PATCH] avcodec/dts2pts_bsf: Avoid poc overflows in cmp_find()

[FFmpeg-devel] [PATCH] avcodec/dts2pts_bsf: Avoid poc overflows in cmp_find()

[Michael Niedermayer]

Fixes: signed integer overflow: -2147483648 - 5 cannot be represented in type 'int'
Fixes: 54242/clusterfuzz-testcase-minimized-ffmpeg_BSF_DTS2PTS_fuzzer-472928339243827

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
 libavcodec/dts2pts_bsf.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/libavcodec/dts2pts_bsf.c b/libavcodec/dts2pts_bsf.c
index 48612e59db..60bec91f99 100644
--- a/libavcodec/dts2pts_bsf.c
+++ b/libavcodec/dts2pts_bsf.c
@@ -90,9 +90,11 @@ static int cmp_insert(const void *key, const void *node)
 
 static int cmp_find(const void *key, const void *node)
 {
-    int ret = ((const DTS2PTSFrame *)key)->poc - ((const DTS2PTSNode *) node)->poc;
+    const DTS2PTSFrame * key1 = key;
+    const DTS2PTSNode  *node1 = node;
+    int ret = (key1->poc > node1->poc) - (key1->poc < node1->poc) ;
     if (!ret)
-        ret = ((const DTS2PTSFrame *)key)->gop - ((const DTS2PTSNode *) node)->gop;
+        ret = key1->gop - node1->gop;
     return ret;
 }
 
-- 
2.17.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] avcodec/dts2pts_bsf: Avoid poc overflows in cmp_find()

[Andreas Rheinhardt]

Michael Niedermayer:
> Fixes: signed integer overflow: -2147483648 - 5 cannot be represented in type 'int'
> Fixes: 54242/clusterfuzz-testcase-minimized-ffmpeg_BSF_DTS2PTS_fuzzer-472928339243827
> 
> Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> ---
>  libavcodec/dts2pts_bsf.c | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/libavcodec/dts2pts_bsf.c b/libavcodec/dts2pts_bsf.c
> index 48612e59db..60bec91f99 100644
> --- a/libavcodec/dts2pts_bsf.c
> +++ b/libavcodec/dts2pts_bsf.c
> @@ -90,9 +90,11 @@ static int cmp_insert(const void *key, const void *node)
>  
>  static int cmp_find(const void *key, const void *node)
>  {
> -    int ret = ((const DTS2PTSFrame *)key)->poc - ((const DTS2PTSNode *) node)->poc;
> +    const DTS2PTSFrame * key1 = key;
> +    const DTS2PTSNode  *node1 = node;
> +    int ret = (key1->poc > node1->poc) - (key1->poc < node1->poc) ;

Don't we have FFDIFFSIGN (or so) for this?

>      if (!ret)
> -        ret = ((const DTS2PTSFrame *)key)->gop - ((const DTS2PTSNode *) node)->gop;
> +        ret = key1->gop - node1->gop;
>      return ret;
>  }
>  

_______________________________________________
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] avcodec/dts2pts_bsf: Avoid poc overflows in cmp_find()

[Michael Niedermayer]

[-- Attachment #1.1: Type: text/plain, Size: 1495 bytes --]

On Mon, Dec 26, 2022 at 03:48:41PM +0100, Andreas Rheinhardt wrote:
> Michael Niedermayer:
> > Fixes: signed integer overflow: -2147483648 - 5 cannot be represented in type 'int'
> > Fixes: 54242/clusterfuzz-testcase-minimized-ffmpeg_BSF_DTS2PTS_fuzzer-472928339243827
> > 
> > Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
> > Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> > ---
> >  libavcodec/dts2pts_bsf.c | 6 ++++--
> >  1 file changed, 4 insertions(+), 2 deletions(-)
> > 
> > diff --git a/libavcodec/dts2pts_bsf.c b/libavcodec/dts2pts_bsf.c
> > index 48612e59db..60bec91f99 100644
> > --- a/libavcodec/dts2pts_bsf.c
> > +++ b/libavcodec/dts2pts_bsf.c
> > @@ -90,9 +90,11 @@ static int cmp_insert(const void *key, const void *node)
> >  
> >  static int cmp_find(const void *key, const void *node)
> >  {
> > -    int ret = ((const DTS2PTSFrame *)key)->poc - ((const DTS2PTSNode *) node)->poc;
> > +    const DTS2PTSFrame * key1 = key;
> > +    const DTS2PTSNode  *node1 = node;
> > +    int ret = (key1->poc > node1->poc) - (key1->poc < node1->poc) ;
> 
> Don't we have FFDIFFSIGN (or so) for this?

yes, i must have forgotten
will apply with FFDIFFSIGN()

thx

[...]

-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

When you are offended at any man's fault, turn to yourself and study your
own failings. Then you will forget your anger. -- Epictetus

[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 195 bytes --]

[-- Attachment #2: Type: text/plain, Size: 251 bytes --]

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