From patchwork Thu Feb 2 17:29:13 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aman Karmani X-Patchwork-Id: 2413 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.89.21 with SMTP id n21csp254456vsb; Thu, 2 Feb 2017 09:29:33 -0800 (PST) X-Received: by 10.223.169.140 with SMTP id b12mr8668564wrd.138.1486056572895; Thu, 02 Feb 2017 09:29:32 -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 o79si29397405wrc.23.2017.02.02.09.29.32; Thu, 02 Feb 2017 09:29:32 -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=@tmm1-net.20150623.gappssmtp.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 0F311680ABB; Thu, 2 Feb 2017 19:29:29 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg0-f68.google.com (mail-pg0-f68.google.com [74.125.83.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C056D680988 for ; Thu, 2 Feb 2017 19:29:22 +0200 (EET) Received: by mail-pg0-f68.google.com with SMTP id 75so2349140pgf.3 for ; Thu, 02 Feb 2017 09:29:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tmm1-net.20150623.gappssmtp.com; s=20150623; h=sender:from:to:cc:subject:date:message-id; bh=0H6/tInDaf6wgT3WD8ZuSpcxyJViT/avxtKhVfxQB8w=; b=CPFlsvzuTMk63g5rAhEsDhS3MDc1zprBMVhNz9xynBZPDKwfwSY0noY3Y3jIeq+72J fwGikgYBMc5p7vsl40IdmcQIQo91dAakv+UxFmpLgU5YQ8TI41inbaAoyTlzsE45z97g Xo1iKwU76vp0SM9E4KUPTV17mq5BWR0y1A2C0LqTEiOVVJwjwpQfQU3UsxPjK5NVZCco Ai1kYUxDeR7hwJvLC+CDWx1VYXHFzADfJMsc5dEittPQRYePkA3loA65nCM71AXAnFht J6cbUXIA4asOVuVuV8EX6LPNZXMI1/e9+fgR+yeT23/P3qRrIAoDm2R5PckPMGc3X4mz zbjg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id; bh=0H6/tInDaf6wgT3WD8ZuSpcxyJViT/avxtKhVfxQB8w=; b=m8OR+lho4Iu55O+hzbkMA7DjpJmO9PmWvXsv8nac11wJl6tOU2459Hh+4oqfYN/Ybh 3T0kDLgElxlxe4e5Zr6pilS/Q6DfxASDt82PDWP1EvJjxCy2JYs+QKKeAppOsp5jXVEp FnIoUm4WTIHVCqiYJ07PBHXPpjG+UGWM69NxW4yfQjIrw9si9ejimcR4ZGzmdptL8nDo 3q+geXtMFCvOvxqS2IA6g6i0wFyd6uPGEF6npF7sjzBXt9wEomg0M0Q1kcFjubq0KBdC TAkJrLKVhiExLhI7ZmU8LBmxAfY3DNxgZGQq90vZ0wdfwY43wZM8dLpLh5mDRLAnM1Pe pl+Q== X-Gm-Message-State: AIkVDXI86L/DXni9xVE2Zg1LI/gOFqbYazoBCAuJiDJPjw/kevsQ2jjd8NSvo4v+oFdkZw== X-Received: by 10.84.231.139 with SMTP id g11mr14315629plk.110.1486056561035; Thu, 02 Feb 2017 09:29:21 -0800 (PST) Received: from tmm1-macbook.local.net (c-73-252-174-83.hsd1.ca.comcast.net. [73.252.174.83]) by smtp.gmail.com with ESMTPSA id l12sm60116554pfj.37.2017.02.02.09.29.20 (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 02 Feb 2017 09:29:20 -0800 (PST) From: Aman Gupta To: ffmpeg-devel@ffmpeg.org Date: Thu, 2 Feb 2017 09:29:13 -0800 Message-Id: <20170202172913.36256-1-ffmpeg@tmm1.net> X-Mailer: git-send-email 2.10.1 (Apple Git-78) Subject: [FFmpeg-devel] [PATCH] avutil/hwcontext_vaapi: fix SEGV in vaTerminate when vaInitialize fails 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: Aman Gupta MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Aman Gupta Program terminated with signal SIGSEGV, Segmentation fault. opts=opts@entry=0x0, flags=flags@entry=0) at libavutil/hwcontext.c:494 --- libavutil/hwcontext_vaapi.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libavutil/hwcontext_vaapi.c b/libavutil/hwcontext_vaapi.c index 6176bdc..0051acb 100644 --- a/libavutil/hwcontext_vaapi.c +++ b/libavutil/hwcontext_vaapi.c @@ -961,14 +961,13 @@ static int vaapi_device_create(AVHWDeviceContext *ctx, const char *device, return AVERROR(EINVAL); } - hwctx->display = display; - vas = vaInitialize(display, &major, &minor); if (vas != VA_STATUS_SUCCESS) { av_log(ctx, AV_LOG_ERROR, "Failed to initialise VAAPI " "connection: %d (%s).\n", vas, vaErrorStr(vas)); return AVERROR(EIO); } + hwctx->display = display; av_log(ctx, AV_LOG_VERBOSE, "Initialised VAAPI connection: " "version %d.%d\n", major, minor);