From patchwork Tue Apr 3 12:41:33 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Thelen X-Patchwork-Id: 8306 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.1.70 with SMTP id c67csp3636362jad; Tue, 3 Apr 2018 05:41:59 -0700 (PDT) X-Google-Smtp-Source: AIpwx4/NmD3rvJ8UlAPjFqqV33VBdCDUqLpfYJly7LAhyCQDo5C7MaeD6N7OJI2WXfQwOwWYaWY8 X-Received: by 10.28.129.80 with SMTP id c77mr3656394wmd.154.1522759319556; Tue, 03 Apr 2018 05:41:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1522759319; cv=none; d=google.com; s=arc-20160816; b=SnJwyPSra22pEIW3TzLOA/NPuZZ1fnb6ZUy5Lyj1HFEG0arW/5DlWWAGOkyLUbsFRC D8PzDEHgSZGnYncmqAo9ESPpRDG1ztrMdwF+DyKH6bcqAy7++WwUFdj+7gB4j0g8YqJe U62uDGhaZFprb6ElP2rRj7HXKf3i2eMLoDv39g2znMtulnGyPb2w1xrKthSVu7PkrECg L+2M9gdiwS7D+hWQm7jSJdtOsWp1ur8otVf89SeV2Z/lYi9tiy3pEe2SqeJx4bAJSnuq JfegHSqPUkQgvb+lwRn8Ct0ezVl1dTy6P14tH9fO8yacEsMwLELHAX9ZLosvzDQ8KDEM 4Cbw== 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:message-id:date:to:from:delivered-to :arc-authentication-results; bh=Tk6SKqTg7rxcWQGnV2eFlIhIlwmhJlKJf9v5AXqx/8Q=; b=NS7Y+WwLdOjMuMPOIMVW2ZPDWg7Dh1CFFc+ARSNyT2q6Rg2q9uyAzMzn+sUHAYxwLw 4VQtTTM7SZb3upIkSHqTTeuZhQWr9rijXZEAUQzK9E9cG+sEASfVG6ggUquIpinjYhXW EfOvWrogVpgLXrbikm6mTV2szQfi85JoIKitWf/1mYrWA0YC9gx+8wgVLyhjHuaeBb/Q 2TQW6UUKum3rj4icQHnJ8a4g0uUeIhdCiHmnxz39LqCC8GabY0iAkd8+jEPx+VLvdRmr FhsDlTmREj1iJt8bRu55IEx1sZ4Ow26IQujTZNbUVDy6vTn2KI6aBzic3f0yKo31/XC6 JMdA== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id g202si2075237wmg.129.2018.04.03.05.41.58; Tue, 03 Apr 2018 05:41:59 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4B0D3689A84; Tue, 3 Apr 2018 15:41:36 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from synchrony.c-14.de (synchrony.c-14.de [88.99.86.234]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 32AF5680504 for ; Tue, 3 Apr 2018 15:41:29 +0300 (EEST) Received: from salusa-secundus.dune (HSI-KBW-134-3-95-137.hsi14.kabel-badenwuerttemberg.de [134.3.95.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) by synchrony.c-14.de (Postfix) with ESMTPSA id 7F077992F6 for ; Tue, 3 Apr 2018 12:41:49 +0000 (UTC) From: Simon Thelen To: ffmpeg-devel@ffmpeg.org Date: Tue, 3 Apr 2018 14:41:33 +0200 Message-Id: <20180403124133.14151-1-ffmpeg-dev@c-14.de> X-Mailer: git-send-email 2.16.3 Subject: [FFmpeg-devel] [PATCH] avcodec/imgconvert: fix possible null pointer dereference 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" regression since 354b26a3945eadd4ed8fcd801dfefad2566241de --- libavcodec/imgconvert.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libavcodec/imgconvert.c b/libavcodec/imgconvert.c index 7b0005b308..1fd636c83d 100644 --- a/libavcodec/imgconvert.c +++ b/libavcodec/imgconvert.c @@ -72,11 +72,12 @@ enum AVPixelFormat avcodec_find_best_pix_fmt_of_list(const enum AVPixelFormat *p int loss; for (i=0; pix_fmt_list[i] != AV_PIX_FMT_NONE; i++) { - loss = *loss_ptr; + loss = loss_ptr ? *loss_ptr : 0; best = avcodec_find_best_pix_fmt_of_2(best, pix_fmt_list[i], src_pix_fmt, has_alpha, &loss); } - *loss_ptr = loss; + if (loss_ptr) + *loss_ptr = loss; return best; }