[FFmpeg-devel,5/6] tools/target_dec_fuzzer: Do not corrupt the packet size return

Submitted by Michael Niedermayer on Aug. 25, 2019, 6:41 p.m.

Details

Message ID 20190825184158.10244-5-michael@niedermayer.cc
State New
Headers show

Commit Message

Michael Niedermayer Aug. 25, 2019, 6:41 p.m.
Fixes: Timeout (infinite)
Fixes: 16732/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_TAK_fuzzer-5642166377906176

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
 tools/target_dec_fuzzer.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

James Almer Aug. 25, 2019, 6:47 p.m.
On 8/25/2019 3:41 PM, Michael Niedermayer wrote:
> Fixes: Timeout (infinite)
> Fixes: 16732/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_TAK_fuzzer-5642166377906176
> 
> Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> ---
>  tools/target_dec_fuzzer.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/tools/target_dec_fuzzer.c b/tools/target_dec_fuzzer.c
> index ce259f35e6..57c75bbfab 100644
> --- a/tools/target_dec_fuzzer.c
> +++ b/tools/target_dec_fuzzer.c
> @@ -222,7 +222,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
>                      if (!avpkt.buf)
>                          error("Failed memory allocation");
>                  } else {
> -                    ret = av_packet_make_refcounted(&avpkt);
> +                    int ret = av_packet_make_refcounted(&avpkt);

Could also instead make it "if (av_packet_make_refcounted(&avpkt) < 0)
error()".

LGTM either way.

>                      if (ret < 0)
>                          error("Failed memory allocation");
>                  }
>
Michael Niedermayer Aug. 25, 2019, 9:31 p.m.
On Sun, Aug 25, 2019 at 03:47:50PM -0300, James Almer wrote:
> On 8/25/2019 3:41 PM, Michael Niedermayer wrote:
> > Fixes: Timeout (infinite)
> > Fixes: 16732/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_TAK_fuzzer-5642166377906176
> > 
> > Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
> > Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> > ---
> >  tools/target_dec_fuzzer.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/tools/target_dec_fuzzer.c b/tools/target_dec_fuzzer.c
> > index ce259f35e6..57c75bbfab 100644
> > --- a/tools/target_dec_fuzzer.c
> > +++ b/tools/target_dec_fuzzer.c
> > @@ -222,7 +222,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
> >                      if (!avpkt.buf)
> >                          error("Failed memory allocation");
> >                  } else {
> > -                    ret = av_packet_make_refcounted(&avpkt);
> > +                    int ret = av_packet_make_refcounted(&avpkt);
> 
> Could also instead make it "if (av_packet_make_refcounted(&avpkt) < 0)
> error()".
> 
> LGTM either way.

will apply with the suggested change

thx

[...]

Patch hide | download patch | download mbox

diff --git a/tools/target_dec_fuzzer.c b/tools/target_dec_fuzzer.c
index ce259f35e6..57c75bbfab 100644
--- a/tools/target_dec_fuzzer.c
+++ b/tools/target_dec_fuzzer.c
@@ -222,7 +222,7 @@  int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
                     if (!avpkt.buf)
                         error("Failed memory allocation");
                 } else {
-                    ret = av_packet_make_refcounted(&avpkt);
+                    int ret = av_packet_make_refcounted(&avpkt);
                     if (ret < 0)
                         error("Failed memory allocation");
                 }