[FFmpeg-devel] [PATCH] avutil/hwcontext_vaapi: fix SEGV in vaTerminate when vaInitialize fails

[Mark Thompson]

On 02/02/17 20:05, Aman Gupta wrote:
> On Thu, Feb 2, 2017 at 9:29 AM, Aman Gupta <ffmpeg at tmm1.net> wrote:
> 
>> From: Aman Gupta <aman at tmm1.net>
>>
>> Program terminated with signal SIGSEGV, Segmentation fault.
>>     opts=opts at entry=0x0, flags=flags at entry=0) at libavutil/hwcontext.c:494
>>
> 
> Looks like my editor ate the gdb backtrace I had pasted. Will resubmit with
> the commit message fixed if no one has objects to the diff.

Patch LGTM (oops).  If you want to make a new version with the commit message adjusted to your satisfaction then it can be applied immediately.

Thanks,

- Mark

>> ---
>>  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);
>>
>> --
>> 2.10.1 (Apple Git-78)