From patchwork Wed Oct 5 13:34:25 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nablet Developer X-Patchwork-Id: 882 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.66 with SMTP id o63csp119323vsd; Tue, 4 Oct 2016 21:45:07 -0700 (PDT) X-Received: by 10.194.29.129 with SMTP id k1mr685909wjh.120.1475642707100; Tue, 04 Oct 2016 21:45:07 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id o124si20012486wme.3.2016.10.04.21.45.06; Tue, 04 Oct 2016 21:45:07 -0700 (PDT) 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; 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 15072689D9F; Wed, 5 Oct 2016 07:44:49 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mout.kundenserver.de (mout.kundenserver.de [212.227.17.24]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E3467689B60 for ; Wed, 5 Oct 2016 07:44:42 +0300 (EEST) Received: from localhost.lan ([46.161.133.229]) by mrelayeu.kundenserver.de (mreue103) with ESMTPSA (Nemesis) id 0LrZ6L-1atOvJ0zfB-013RAb; Wed, 05 Oct 2016 06:32:04 +0200 From: Nablet Developer To: ffmpeg-devel@ffmpeg.org Date: Wed, 5 Oct 2016 09:34:25 -0400 Message-Id: <1475674465-10776-1-git-send-email-sdk@nablet.com> X-Mailer: git-send-email 1.8.3.1 X-Provags-ID: V03:K0:WW7s3NNL62i5/ZJt6YI4nO683Qp3EPOhlxZ1DD1vE5xFFe7w9Aa 4UIAMrCm+3kDdRM97f8D9m8CRmPMJB0fUtVIpl1+8pjPFUVWAKy90H/lHCps9fG2zU2dhgS sX6o2TMINi+BpvK6GnNa7HVnlG1qwmN3ccbOZbH60kaPGzOdsIvlNLMYkdMyNvrpQyoUbZ4 pLWc27onHIDNTExu9ktAg== X-UI-Out-Filterresults: notjunk:1; V01:K0:NU3qiMeworI=:sfVCuwdNadW1KO3kjTcSAl XtQjClEq34Uwqsobk/ZP/Ns6G0WjT+jMjbCnX1rBdMP5J5L0cyWkMPqlMVnfJAbQogzQWHWbb 1K3jQeIlUJZtfOfnk8JkPuSKTrVdCQO/ubN3dd7GJvxCzSvIvs5enayeZU3epSQsRsrbKlNaN SqnuSvJgyEgj/sI26lWdqp46N7jCKEhF/5vBSfUAsMEaLRu11mUUpDrzdne6nJGPpAFNhHn9e 17oKxvr31kzcgDRt1I+c5mJ0lWORJ4AyraDHdzo6hlwV27nlL1+KG6JqzWs13WK6OvPnTsrlf ceVe4hZvLSuajWk24wf0iPkBueNpNVAq8szaMkd+t2eD8fJqoT2FPNC4jDb33Y4IT8qYJw8dg c1RDv6MenB7YwsXYiC4KpZRvu0W0DOJg85PlFnArKRJy7iPZ72B+xPeydPx3gcMwIxrNeK3q2 MXAlVoO1ipvP0aNdphxnViZigT+XF+5GcIS50Achhu9if28gne2J9pBtGbQFELK4K3Tj3Uedk DDWrouy+QYs4ebdCZVNEeE8yX/O+4KpMAkbuX4y/DBjdMlJ7eKp1kXwQfWbywdcE72gVhi2U4 EhYCUSrCmQpiAr5ZeMVcDeoyHUsqdE+E955r8lDQr0Z6//6IIjMaIFkPBfc5efQ3IsW7GwlBf MDtCjuIahkBcPgI+bx98WlycJBC7YgqwCRsP8kDsB+o+9JYJ6bT16hRvuzv2eeCpltUo= Subject: [FFmpeg-devel] [PATCH] avcodec/qsvenc_h264: fix segfault when a53 SEI is not available 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: Nablet Developer MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Nablet Developer --- libavcodec/qsvenc_h264.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/qsvenc_h264.c b/libavcodec/qsvenc_h264.c index c1f6003..f5b01bb 100644 --- a/libavcodec/qsvenc_h264.c +++ b/libavcodec/qsvenc_h264.c @@ -53,7 +53,7 @@ static int qsv_h264_set_encode_ctrl(AVCodecContext *avctx, int res; res = ff_alloc_a53_sei(frame, sizeof(mfxPayload) + 2, (void**)&payload, &sei_size); - if (res < 0) + if (res < 0 || !payload) return res; sei_data = (mfxU8*)(payload + 1);