From patchwork Sat Jan 12 15:31:35 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Fedchin X-Patchwork-Id: 11747 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id A142444D17D for ; Mon, 14 Jan 2019 21:22:36 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C344868A616; Mon, 14 Jan 2019 21:22:24 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f52.google.com (mail-lf1-f52.google.com [209.85.167.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 55410689FCE for ; Sat, 12 Jan 2019 17:38:31 +0200 (EET) Received: by mail-lf1-f52.google.com with SMTP id p6so12896207lfc.1 for ; Sat, 12 Jan 2019 07:38:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=weezlabs-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=01nomwjqk+AI+U8Cu9vESi7iGTdTzP6ZeNrrT1aUnj0=; b=s1+9vFCuiz6nY4PwbuKEMmWjpZ0g0iEfY1WlJg7JGn775Fz2KW47JONd77CAtzC1e0 pYvfl0XT1/MM1nRYSvtMznBdL9NMw6Q4u/UiE/Q+uKmIVmQZM3EQlJV+gQJG7GUQoV3s U4pg0koAKZsgBeYEVPOcS+V7Se8WekipkxTGguzSaTwIGlIvDJVomTjeo42AFUbOjdo2 m/4+v63yvRFa5a1V6gv51XtF/0SwlCoky2SXwTOVfzoQQFyBWkqFxu/UqlPTOs/VYxym 3hQuxXadce8I3AlQRthqJ3bNVqaKWfbLixm2SBIflif/ic9MMAzqiVSkmZVMYjom4OdT 5Rig== 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=01nomwjqk+AI+U8Cu9vESi7iGTdTzP6ZeNrrT1aUnj0=; b=YTBiTrlbVtn5fp7zsrNfGKz3tH2MgeIPypnWw526XzzX5GcJ+nvjRqqcNr3idrOpHh kJzr9MrQ/L3BfG6yaMG1pRF8qYSutwIUN1RRo/r7lnMbIkZfBRTuaYi6O9sOL3KT6SkZ DVK1UCnrr1+vp/ZSy8p10lZySy8D93i308MDe3vHPu6MFobkOPT12TvDcVJXdU/I1hAG cumL6Yz89Rpd2oXkwrXTleMQk+TeDZXGXcoEpPVAVSDBfrxulshLXQlZVv3RlonupN5S OKtguPjbl2KGnQzqfKl0Nkb8UVZAQM9vz18VawxzbnImI/jU7MbTuTX4adirw90CQuE1 gvwQ== X-Gm-Message-State: AJcUuke466LgEcVlpH05+QM6iqI1qXY4MCf798fnEC+yKFdLDwXF35/Z 33573sx58sTGRyWY2dwgBRQUDFsa1r0= X-Google-Smtp-Source: ALg8bN4Hd69nJZwHBoZOpdLHLMrzMO7UCVUpBM5uvwc4cbzyzfczTsQSU5Uj9WuYIVXCr2MwJZtVBA== X-Received: by 2002:a19:41c4:: with SMTP id o187mr10852004lfa.32.1547307105625; Sat, 12 Jan 2019 07:31:45 -0800 (PST) Received: from localhost.localdomain ([109.165.25.180]) by smtp.gmail.com with ESMTPSA id p10-v6sm16361424ljh.59.2019.01.12.07.31.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 12 Jan 2019 07:31:44 -0800 (PST) From: Anton Fedchin To: ffmpeg-devel@ffmpeg.org Date: Sat, 12 Jan 2019 18:31:35 +0300 Message-Id: <20190112153136.2868-1-afedchin@weezlabs.com> X-Mailer: git-send-email 2.17.1.windows.2 X-Mailman-Approved-At: Mon, 14 Jan 2019 21:22:23 +0200 Subject: [FFmpeg-devel] [PATCH 1/2] avcodec/dxva2: d3d11va: don't try to get surface description for nullptr 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: Anton Fedchin MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Anton Fedchin after 153b36f there is a possibility to crash when trying to get index of a surface which points to nirvana. it may occurs when a stream starts with non i-frame. --- libavcodec/dxva2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/dxva2.c b/libavcodec/dxva2.c index 32416112bf..e0919d0b1c 100644 --- a/libavcodec/dxva2.c +++ b/libavcodec/dxva2.c @@ -771,7 +771,7 @@ unsigned ff_dxva2_get_surface_index(const AVCodecContext *avctx, #if CONFIG_D3D11VA if (avctx->pix_fmt == AV_PIX_FMT_D3D11) return (intptr_t)frame->data[1]; - if (avctx->pix_fmt == AV_PIX_FMT_D3D11VA_VLD) { + if (avctx->pix_fmt == AV_PIX_FMT_D3D11VA_VLD && surface) { D3D11_VIDEO_DECODER_OUTPUT_VIEW_DESC viewDesc; ID3D11VideoDecoderOutputView_GetDesc((ID3D11VideoDecoderOutputView*) surface, &viewDesc); return viewDesc.Texture2D.ArraySlice;