From patchwork Thu Jul 6 18:28:34 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Derek Buitenhuis X-Patchwork-Id: 4235 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.1.76 with SMTP id 73csp2525971vsb; Thu, 6 Jul 2017 11:30:14 -0700 (PDT) X-Received: by 10.28.111.215 with SMTP id c84mr424627wmi.72.1499365814635; Thu, 06 Jul 2017 11:30:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1499365814; cv=none; d=google.com; s=arc-20160816; b=ceUNbsm6WzO1X+v4hFH8sWQbm91XfvuY72uk80C8s4CUznVa0MhAJlakWTq8oM9nMb DP1fE41PgzONS2QzjDtq6PEOjZoP2KvbRtyHTssjABFfrTtjoBTOv1oVNImUvzBdzpf8 n4bzwIy7LsUWU4vrTLgJ9vwSQ+d35avNDtAVZnrysMVId8HBjtK0tTtLlNjcHSpcG55N ABh+TzHtHKMVRrIf3tH5d0FU+UxaBNO0kyyTP02enlYpcSPQQvIPm0tBS9k2SOYbUyqe u5v/3Xoi/jKc8DlzcPRRAeAbPHzTwYPJuEjHa1Ca8TVgtjBAK5re39zEfyaNIrW5L+QN Ithw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=DRW/RvecHRWbhCvMu/KmXPN5H+tH5sAgYN1bcgtyYEY=; b=y3nST/0OqXzEmrjEBhhiNlVkARPOleExLpFi9xy70MqeK6CSLRKeTRKIbTTKkLLcxv OIPBoQPvjYG76VBTEHQ113SkP9kEBGvuXDNdnx8w4WpEBvIoBDx5F97fh6C2evWy+gNQ eqh62QGPm0qPwPgdB9OgXB4xWuvQj7yr4dIzu0cHwXbMMSnybf1cxD3LBHkP/WCSS6Yn 6o9RxU+9ozUMhiHrVTSE/COkecub1LzOGYPHWoILXPEFgHJ2tLj+G34K8De+Hceg+ocu 1ENzqWD0hBc0kd6k0jA20uzZPKqjAl9L2bQSl/nn4u4EHXoQLj0yXypb1AX5Aqe50PB2 RXlg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=pSka3rQg; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id n202si898781wmd.152.2017.07.06.11.30.14; Thu, 06 Jul 2017 11:30:14 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=pSka3rQg; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4242368991C; Thu, 6 Jul 2017 21:29:36 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f196.google.com (mail-wr0-f196.google.com [209.85.128.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6E0196898CA for ; Thu, 6 Jul 2017 21:29:34 +0300 (EEST) Received: by mail-wr0-f196.google.com with SMTP id x23so2317578wrb.0 for ; Thu, 06 Jul 2017 11:29:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=az90IglO8KfaZaSVmwTygobXpHhKuwrIf+5TivRugvQ=; b=pSka3rQgGMUw5EPYr6kb1o2ajStDLJfsxc5EyaM6j2cCidssIVxUMY8cD9lmgHYM4/ KYCRcJKGfQchu9SqxrM2DSvPAcggHTIO1FSX4MlQe6junY6EmZnQ9ej+REGPcW28h0gW wx/LAxAJVr4LjBdocwXigYKUqo0aFaWdJ0qTsZ9B5wPSEGk/fNrY7Wc6uQITpfKsC0wC btI8CWTFUzxkp+js4PqWfDxtSJfhAFjwZq0H6pfEpqcWwbN/2ImOJFLt6SrvPRhiiQuI fS9xgjlwb/NmfaonEiug8mlHDPPVeGtR57/1hjh2wKkUJa4FQIOLpEckI6SSSDtD/Lu5 lqiA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=az90IglO8KfaZaSVmwTygobXpHhKuwrIf+5TivRugvQ=; b=XptGFG8vk9Va6myXkWvNnQeEqE1gc3EECkSPttN85JEzhs2kFpKjvWYIc5PFVsCZDH HA4nHf8mfUTBLh8rvWhJdCYw1vvfOzQiGRykKk/8nCjwJ/eFWo+8eSDQ5YzSOL3Jrqf3 pqLX2HLbZLZyhB9VJDXyF8Co35ka1y7tIfzKx4BVLyO+meTM2jZDRNtKerkwaaoe0Pbh bcm6fxrZoqfgFabGQyfYHHno6eyKqSvdmRQUU3jTtsTXmSGZuVAcd4lkZA0d4HQdAoJj MvZsEVrfr5uATglVB/Byxo85MHS7Jgddkd59SqbD1YOhChbkEwjW5oxkH4W+4JifmVRh WXew== X-Gm-Message-State: AIVw110mNuuS3L18zSVGcoBVZaktLn2j/j2Roq2kZvS8/+pnVuP/ow9n 7fwNPHVj8TYAyx2Yec0= X-Received: by 10.80.178.35 with SMTP id o32mr291847edd.185.1499365776503; Thu, 06 Jul 2017 11:29:36 -0700 (PDT) Received: from localhost.localdomain ([62.208.38.79]) by smtp.gmail.com with ESMTPSA id k49sm1371108eda.45.2017.07.06.11.29.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 06 Jul 2017 11:29:36 -0700 (PDT) From: Derek Buitenhuis To: ffmpeg-devel@ffmpeg.org Date: Thu, 6 Jul 2017 19:28:34 +0100 Message-Id: <20170706182842.7785-5-derek.buitenhuis@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170706182842.7785-1-derek.buitenhuis@gmail.com> References: <20170706182842.7785-1-derek.buitenhuis@gmail.com> Subject: [FFmpeg-devel] [PATCH 04/12] scpr: Added missing error check X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Derek Buitenhuis --- 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; cx1 = (cx << 6) & 0xFC0; cx = r >> cxshift;