From patchwork Sun Jun 30 22:51:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carl Eugen Hoyos X-Patchwork-Id: 13781 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 19CA344944B for ; Mon, 1 Jul 2019 01:52:17 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id ED9F068A043; Mon, 1 Jul 2019 01:52:16 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-io1-f52.google.com (mail-io1-f52.google.com [209.85.166.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 15439688357 for ; Mon, 1 Jul 2019 01:52:11 +0300 (EEST) Received: by mail-io1-f52.google.com with SMTP id s7so24375273iob.11 for ; Sun, 30 Jun 2019 15:52:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=OUB3P1UdlT1t9NySBtQ+4AJUA8J4RE1+n1uXOJjECfo=; b=BLv403+sOdoRaPLkMWZxN5Xivohi3gLtC9iWvm7niNot6FHDF3zc8Dix73WzGwczUa 0YdSGJV9uNPBxgkGDAq1x7dzvFzbv7NkYz7iAMmhMpeMnCgkx26vY7uuWH4QsF8bf2tv m4o4VhyeQRXv8tsqJuK0glw+1Z0hQVSEzwMVsz5jzzjvuSC+Pm2tnoGl0JX2bB85nl2z wy8Yw7XaYjV+FSAAwfTYMDN3CkZzzr5EeTcXIk8e1GoX/kwQnY61wJo60AO0J/dtsaPP x7dMcNQuEGhswXfFigE7R26QT4WH1hOo2BxUZABZR6P1OgKSuqZ9Dd689cHhMRNrDVs7 XCDQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=OUB3P1UdlT1t9NySBtQ+4AJUA8J4RE1+n1uXOJjECfo=; b=T1y2ITPUduHOWhII+mFb8jPLjE4F2BVEGLE+hC5tSxqOXmqreaUsDUHLLzGZhyqSOy /kul3L03e30u1A8n9Cy6HIM11nip6Y9cpwyG30XqWiZheYc9hh/63+GEXHyTm7/jaPrm uGPCQKuErD8N2flexcp6BjSFbBodkuMKix9faQf1+H3umOwG3q1++0g6FZVp6UNAWXoi TXCWWio1owlUREEGoqaZxLLjTvrhw3VQ3n3Wu6e6XdtLMQFwQPtoA54g3tJtRi6q7rkK WYWNh7xhg+AExnPfv7MNe3P6+nq/2DPyhAJh7OtfYOFKx2D1xSvx3/RHU0BO16lj2I1K ZYVA== X-Gm-Message-State: APjAAAVeKMTV80uY4SS8vnsUB7pmNt6MCFUWmE0Y+y+p0eJng67fEsZO 7SAkjEXXoYkEH4EfoRh9rVT8BRRGwVBTjB1MNWTEAw== X-Google-Smtp-Source: APXvYqz1RFoCuepxKMCiEI9yf2JTo4nsV9Z/NIZEmojge/WzFn8DhsBJoixCFhRqZWE3zdM3ikds0wh44DswjA/uI5g= X-Received: by 2002:a5d:9957:: with SMTP id v23mr22422303ios.117.1561935129612; Sun, 30 Jun 2019 15:52:09 -0700 (PDT) MIME-Version: 1.0 From: Carl Eugen Hoyos Date: Mon, 1 Jul 2019 00:51:58 +0200 Message-ID: To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PATCH]lavc/frame_thread_encoder: Do not memcpy() from NULL 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Hi! I believe attached patch fixes undefined behaviour and ticket #7981. Please comment, Carl Eugen From d72fe544d6d7cdf816a75df858b17f1744049d97 Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Mon, 1 Jul 2019 00:49:44 +0200 Subject: [PATCH] lavc/frame_thread_encoder: Do not memcpy() from NULL. Fixes ticket #7981. --- libavcodec/frame_thread_encoder.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/frame_thread_encoder.c b/libavcodec/frame_thread_encoder.c index 55756c4c54..bb2a5ed222 100644 --- a/libavcodec/frame_thread_encoder.c +++ b/libavcodec/frame_thread_encoder.c @@ -209,8 +209,9 @@ int ff_frame_thread_encoder_init(AVCodecContext *avctx, AVDictionary *options){ int ret = av_opt_copy(thread_avctx->priv_data, avctx->priv_data); if (ret < 0) goto fail; - } else + } else if (avctx->priv_data) { memcpy(thread_avctx->priv_data, avctx->priv_data, avctx->codec->priv_data_size); + } thread_avctx->thread_count = 1; thread_avctx->active_thread_type &= ~FF_THREAD_FRAME; -- 2.22.0