diff mbox

[FFmpeg-devel,04/12] scpr: Added missing error check

Message ID 20170706182842.7785-5-derek.buitenhuis@gmail.com
State Superseded
Headers show

Commit Message

Derek Buitenhuis July 6, 2017, 6:28 p.m. UTC 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
---
 libavcodec/scpr.c | 2 ++
 1 file changed, 2 insertions(+)

Comments

Paul B Mahol July 6, 2017, 6:33 p.m. UTC | #1 
On 7/6/17, Derek Buitenhuis <derek.buitenhuis@gmail.com> wrote:
> Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
> ---
>  libavcodec/scpr.c | 2 ++
>  1 file changed, 2 insertions(+)
>
> diff --git a/libavcodec/scpr.c b/libavcodec/scpr.c
> index f6d1e45692..29ee70d521 100644
> --- a/libavcodec/scpr.c
> +++ b/libavcodec/scpr.c
> @@ -311,6 +311,8 @@ static int decompress_i(AVCodecContext *avctx, uint32_t
> *dst, int linesize)
>          ret = decode_unit(s, &s->pixel_model[0][cx + cx1], 400, &r);
>          if (ret < 0)
>              return ret;
> +        if (ret < 0)
> +            return ret;

Hmm?
Derek Buitenhuis July 6, 2017, 6:51 p.m. UTC | #2 
On 7/6/2017 7:33 PM, Paul B Mahol wrote:
>> +        if (ret < 0)
>> +            return ret;
> 
> Hmm?

Seems I forgot to amend this one properly. v2 sent.

- Derek
diff mbox

Patch

diff --git a/libavcodec/scpr.c b/libavcodec/scpr.c
index f6d1e45692..29ee70d521 100644
--- a/libavcodec/scpr.c
+++ b/libavcodec/scpr.c
@@ -311,6 +311,8 @@  static int decompress_i(AVCodecContext *avctx, uint32_t *dst, int linesize)
         ret = decode_unit(s, &s->pixel_model[0][cx + cx1], 400, &r);
         if (ret < 0)
             return ret;
+        if (ret < 0)
+            return ret;
 
         cx1 = (cx << 6) & 0xFC0;
         cx = r >> cxshift;