diff --git a/libavcodec/scpr.c b/libavcodec/scpr.c
index f6d1e45692..37fbe7a106 100644
--- a/libavcodec/scpr.c
+++ b/libavcodec/scpr.c
@@ -582,6 +582,8 @@ static int decompress_p(AVCodecContext *avctx,
 
                 for (; by < y * 16 + sy2 && by < avctx->height;) {
                     ret = decode_value(s, s->op_model[ptype], 6, 1000, &ptype);
+                    if (ret < 0)
+                        return ret;
                     if (ptype == 0) {
                         ret = decode_unit(s, &s->pixel_model[0][cx + cx1], 400, &r);
                         if (ret < 0)