From patchwork Fri Feb 10 03:20:14 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Koshevoy X-Patchwork-Id: 2472 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.89.21 with SMTP id n21csp300271vsb; Thu, 9 Feb 2017 19:20:35 -0800 (PST) X-Received: by 10.223.167.66 with SMTP id e2mr5370050wrd.48.1486696835698; Thu, 09 Feb 2017 19:20:35 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id g200si823012wmd.121.2017.02.09.19.20.34; Thu, 09 Feb 2017 19:20:35 -0800 (PST) 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; 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 E7A1A689C38; Fri, 10 Feb 2017 05:20:27 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg0-f67.google.com (mail-pg0-f67.google.com [74.125.83.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3AD6E680CF2 for ; Fri, 10 Feb 2017 05:20:21 +0200 (EET) Received: by mail-pg0-f67.google.com with SMTP id 204so1920369pge.2 for ; Thu, 09 Feb 2017 19:20:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=wTKBZHa+1T0HqCZ1fqojpdcM1CI6bQMdqOgbvFITt2Q=; b=WdRaOH0R7bwHlYJcpMxh0xc52wwxeyGUjASaiuwPoYUkuR8sFAJVvhbALSg780URNE OOaUkzzvWLWoDT89vYHV2WHOXs+7WcTy7gT5GXYMcvu1iZdkrN1w4kOP8u1Uilbpj4O9 QAFmaLCkfgurl6nQUKawi3O2pFKs1DEwt7cskl7t7A1psh43li0M65OelKnnco9DICqk nznFy+uigw0AynvWpKJcarBTMFcuVMIZWbiaG9kbCgDeQkbSEMPGKcx3ppQeT07iR5RH Rgc7ajGw+ENtMOJIxpK6HZBBGGMqHUb/GlGVTuXyCcZ5pAobuIQnkFynSGqURsAior1z ssFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=wTKBZHa+1T0HqCZ1fqojpdcM1CI6bQMdqOgbvFITt2Q=; b=oSKRGu87FX6Z+j9r4u0xyEllB0Oz33VNwuoelV5y4RSI7uYGSWosekG1lP2ao0rzmr lgXokIljaT4kvwY3OijkiebKkxaQ6ywRQA+TmzK7DjxL0GRSD7L3HFOjpQ5Z7tXfY0XU YNEKfQHWeepdnx6q3L3+8WCoifNygy9d12z95rWy99VfWT/j7N7KQJdViZMn2iWedsqh XwwlQ9aOwh9T8dHmZf/xMm2COpx2MPhmTfIXITSrWpEXcfVLITg0EC93sk7TUSEuyF52 +ZZ1TLsPfZta6ksb0brSdH18fRFULqfgK1fJhagIOaoGfe8rbUsDWXFE5RFXAWJKa77y NExA== X-Gm-Message-State: AMke39nl01kO4uNZaTvAXKyOlwWhBvO8Tp+FV0/P7JHJdjA+5wRIrvmk+CgsTuGv4uAQYQ== X-Received: by 10.99.129.193 with SMTP id t184mr7912852pgd.129.1486696823434; Thu, 09 Feb 2017 19:20:23 -0800 (PST) Received: from homestead.aragog.com ([136.60.170.51]) by smtp.gmail.com with ESMTPSA id p14sm468471pfl.75.2017.02.09.19.20.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 09 Feb 2017 19:20:22 -0800 (PST) From: pkoshevoy@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Thu, 9 Feb 2017 20:20:14 -0700 Message-Id: <1486696814-16632-1-git-send-email-pkoshevoy@gmail.com> X-Mailer: git-send-email 2.6.6 Subject: [FFmpeg-devel] [PATCH] lavc/vda_h264_dec.c Fix 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 Cc: Pavel Koshevoy MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Pavel Koshevoy ps.sps_list entries may be NULL, so check before dereferencing --- libavcodec/vda_h264_dec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/vda_h264_dec.c b/libavcodec/vda_h264_dec.c index 92839e2..972bd6b 100644 --- a/libavcodec/vda_h264_dec.c +++ b/libavcodec/vda_h264_dec.c @@ -226,7 +226,7 @@ static av_cold int vdadec_init(AVCodecContext *avctx) ctx->h264_initialized = 1; for (i = 0; i < MAX_SPS_COUNT; i++) { - const SPS *sps = (const SPS*)ctx->h264ctx.ps.sps_list[i]->data; + const SPS *sps = ctx->h264ctx.ps.sps_list[i] ? (const SPS*)ctx->h264ctx.ps.sps_list[i]->data : NULL; if (sps && (sps->bit_depth_luma != 8 || sps->chroma_format_idc == 2 || sps->chroma_format_idc == 3)) {