From patchwork Sat Dec 22 13:12:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Fedchin X-Patchwork-Id: 11557 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 CE6AD44CF74 for ; Wed, 26 Dec 2018 21:55:50 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8350968B0DD; Wed, 26 Dec 2018 21:55:47 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lj1-f177.google.com (mail-lj1-f177.google.com [209.85.208.177]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B028968AFCB for ; Sat, 22 Dec 2018 15:12:30 +0200 (EET) Received: by mail-lj1-f177.google.com with SMTP id s5-v6so7061597ljd.12 for ; Sat, 22 Dec 2018 05:12:34 -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=4Y6iYzllPgiO3yCue+oo3ZOjm528AbZEY1FpJ+o3jUA=; b=XlPxRJZsugKlDKCZZB2hYYwSXXU7+H+rrWQNngKusVl9Fm54/N2bT0ZitxJKiLNazE 84enVKB1d/ZsQKbLoxHBtaA7oBROqMv711ifC8Az8RzB4h5HvUSVRHP6ZGQTJyTQ12+t Loi7mwdMf+AOBVjV+mhyrRRqC6U7X3T5sstUcFX2WmS6fH/6cuuTln7un6Av1lisVlLM e75ekwngmjJ1gvWwaplMjhu5v14/lCFvFMC/HzKS1G/oCoMVLpYl0vl9T9CriZXFWqH/ 0niTJia+0YiHpd+puRFsLCHqU1kz+KlT5oej3G0y51dhdTV0kpf6r9hS1jgxaPgNpdod mmfQ== 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=4Y6iYzllPgiO3yCue+oo3ZOjm528AbZEY1FpJ+o3jUA=; b=ZnepohnUs7ccF47j09Ux5olzp6h3WLVmdr1r1S1IMxUH8L29vwRRFV/4MzYTuu3vfQ duWjXpBu0WLxrXbv02OJHU9JhR0s2uIV8Mn7LVyYLlyhekAbrfrt6EahL3nwZd5fT7Me dcPLMIkXVsxXqcw9CKOQHJjVTNFqUxmucEMgRKIOHvJLIwPqhQMIU+04OAbe5aWcpyq9 1hmDWeWiqM9EGzCKwv5DZA07AvxvEuLYFz4CzBMw3R6ql2IA/IERXnzyG2+Rxs47H2A7 G49zRa/rsY5VONjQjQbm5XSWQDfEtPZraK9oO6jXC6QKbN87DAL7PxyW1uzHr+yCo7/r PkXQ== X-Gm-Message-State: AJcUukfsZ7BwKYUYl1QS9MhyxI14zRqIr/UnJkjAwuBykIMr201RxrZS rdIFAS9Ri//FQRq6DLyHgxtbhNSrpSE= X-Google-Smtp-Source: AFSGD/V18gVo+c9k3VMpyh+7846b51xxSGvwgvNV/wUI9PC/nGsXZoME7cIapnw2PIj7LA13dcpWjg== X-Received: by 2002:a2e:4442:: with SMTP id r63-v6mr3861940lja.79.1545484353440; Sat, 22 Dec 2018 05:12:33 -0800 (PST) Received: from localhost.localdomain ([31.23.69.179]) by smtp.gmail.com with ESMTPSA id u21-v6sm5238677lju.46.2018.12.22.05.12.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 22 Dec 2018 05:12:32 -0800 (PST) From: Anton Fedchin To: ffmpeg-devel@ffmpeg.org Date: Sat, 22 Dec 2018 16:12:23 +0300 Message-Id: <20181222131223.4192-1-afedchin@weezlabs.com> X-Mailer: git-send-email 2.17.1.windows.2 X-Mailman-Approved-At: Wed, 26 Dec 2018 21:55:45 +0200 Subject: [FFmpeg-devel] [PATCH] avcodec/dxva2_mpeg2.c: don't try to get surface index for absent frame 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 mpeg2 stream starts with non i-frame. --- libavcodec/dxva2_mpeg2.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/dxva2_mpeg2.c b/libavcodec/dxva2_mpeg2.c index 8cc21bf199..c862e6e5e4 100644 --- a/libavcodec/dxva2_mpeg2.c +++ b/libavcodec/dxva2_mpeg2.c @@ -48,11 +48,11 @@ static void fill_picture_parameters(AVCodecContext *avctx, memset(pp, 0, sizeof(*pp)); pp->wDecodedPictureIndex = ff_dxva2_get_surface_index(avctx, ctx, current_picture->f); pp->wDeblockedPictureIndex = 0; - if (s->pict_type != AV_PICTURE_TYPE_I) + if (s->pict_type != AV_PICTURE_TYPE_I && s->last_picture_ptr) pp->wForwardRefPictureIndex = ff_dxva2_get_surface_index(avctx, ctx, s->last_picture.f); else pp->wForwardRefPictureIndex = 0xffff; - if (s->pict_type == AV_PICTURE_TYPE_B) + if (s->pict_type == AV_PICTURE_TYPE_B && s->next_picture_ptr) pp->wBackwardRefPictureIndex = ff_dxva2_get_surface_index(avctx, ctx, s->next_picture.f); else pp->wBackwardRefPictureIndex = 0xffff;