[FFmpeg-devel] [PATCH] avcodec/tiff: Fix leak on error

[FFmpeg-devel] [PATCH] avcodec/tiff: Fix leak on error

[Andreas Rheinhardt]

Fixes Coverity issue #1516957.

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

diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c
index 19301d9e49..111ce3ea3a 100644
--- a/libavcodec/tiff.c
+++ b/libavcodec/tiff.c
@@ -2267,8 +2267,10 @@ again:
             group_size = s->width * channels;
 
             tmpbuf = av_malloc(ssize);
-            if (!tmpbuf)
+            if (!tmpbuf) {
+                av_free(five_planes);
                 return AVERROR(ENOMEM);
+            }
 
             if (s->avctx->pix_fmt == AV_PIX_FMT_RGBF32LE ||
                 s->avctx->pix_fmt == AV_PIX_FMT_RGBAF32LE) {
-- 
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] avcodec/tiff: Fix leak on error

[Michael Niedermayer]

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

On Fri, May 17, 2024 at 09:51:05PM +0200, Andreas Rheinhardt wrote:
> Fixes Coverity issue #1516957.

Please mark issues that you fixed in coverity accordingly so that others
(like me) see it and know what issues remain outstanding by well looking
at the list of outstanding issues

thx

[...]
-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

Old school: Use the lowest level language in which you can solve the problem
            conveniently.
New school: Use the highest level language in which the latest supercomputer
            can solve the problem without the user falling asleep waiting.

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

Re: [FFmpeg-devel] [PATCH] avcodec/tiff: Fix leak on error

[Andreas Rheinhardt]

Andreas Rheinhardt:
> Fixes Coverity issue #1516957.
> 
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
> ---
>  libavcodec/tiff.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c
> index 19301d9e49..111ce3ea3a 100644
> --- a/libavcodec/tiff.c
> +++ b/libavcodec/tiff.c
> @@ -2267,8 +2267,10 @@ again:
>              group_size = s->width * channels;
>  
>              tmpbuf = av_malloc(ssize);
> -            if (!tmpbuf)
> +            if (!tmpbuf) {
> +                av_free(five_planes);
>                  return AVERROR(ENOMEM);
> +            }
>  
>              if (s->avctx->pix_fmt == AV_PIX_FMT_RGBF32LE ||
>                  s->avctx->pix_fmt == AV_PIX_FMT_RGBAF32LE) {

Will apply this patch 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".