[FFmpeg-devel] [PATCH] avcodec/sbcdec: Remove always-false check

[FFmpeg-devel] [PATCH] avcodec/sbcdec: Remove always-false check

[Andreas Rheinhardt]

We never guard against a user freeing/stealing the private context;
and returning AVERROR(EIO) is inappropriate.

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

diff --git a/libavcodec/sbcdec.c b/libavcodec/sbcdec.c
index 3fac2f5016..fd7c2e5e80 100644
--- a/libavcodec/sbcdec.c
+++ b/libavcodec/sbcdec.c
@@ -343,9 +343,6 @@ static int sbc_decode_frame(AVCodecContext *avctx, AVFrame *frame,
     SBCDecContext *sbc = avctx->priv_data;
     int ret, frame_length;
 
-    if (!sbc)
-        return AVERROR(EIO);
-
     frame_length = sbc_unpack_frame(avpkt->data, &sbc->frame, avpkt->size);
     if (frame_length <= 0)
         return frame_length;
-- 
2.34.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/sbcdec: Remove always-false check

[Andreas Rheinhardt]

Andreas Rheinhardt:
> We never guard against a user freeing/stealing the private context;
> and returning AVERROR(EIO) is inappropriate.
> 
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
> ---
>  libavcodec/sbcdec.c | 3 ---
>  1 file changed, 3 deletions(-)
> 
> diff --git a/libavcodec/sbcdec.c b/libavcodec/sbcdec.c
> index 3fac2f5016..fd7c2e5e80 100644
> --- a/libavcodec/sbcdec.c
> +++ b/libavcodec/sbcdec.c
> @@ -343,9 +343,6 @@ static int sbc_decode_frame(AVCodecContext *avctx, AVFrame *frame,
>      SBCDecContext *sbc = avctx->priv_data;
>      int ret, frame_length;
>  
> -    if (!sbc)
> -        return AVERROR(EIO);
> -
>      frame_length = sbc_unpack_frame(avpkt->data, &sbc->frame, avpkt->size);
>      if (frame_length <= 0)
>          return frame_length;

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