From patchwork Thu Jul 6 17:34:21 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Derek Buitenhuis X-Patchwork-Id: 4229 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.1.76 with SMTP id 73csp2472278vsb; Thu, 6 Jul 2017 10:35:34 -0700 (PDT) X-Received: by 10.28.20.200 with SMTP id 191mr256843wmu.1.1499362534572; Thu, 06 Jul 2017 10:35:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1499362534; cv=none; d=google.com; s=arc-20160816; b=nBoapbuaR5VWHbzOfAdYHFzOvY8jvF84ZWT0jp8i+qGujHsCxB9YyVxPU4Ct1X09Q4 KUrRk+8+JGIRXr3WJUdQf+F49HzwT8vFz9jB7RMUlBzqbZdzCDCdJ9nW0mp1URN2/2Ec aGJohncJhX+PrKGHvQ/SifGq22Ld5JjXkR/gQcFkoOruSEBT6rgIzigkNYoeB0NmpekL 0V2zTtewQcjK77gCub5YSwB/t3q5vBV8hHI2eWjjBOW+VGXuwBsNFOKKEoxyTKKjHzfm lcKip9zBesI+zw6JIJICKLSxui8tiYUcVESRkTociD/6X5jVt/BjgbHMzNf+Dh/VHsNV btnw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=7am68R/38uJmP9P7QnbWlcFcveLGkRpQzMKt6a1f9vo=; b=nX/IK2x6hcb2lEoesW4LGyq3bQc6LB58oPFaUHJxu4m16R71IkAVtQV9bLHVQ3V8jL xgAbOB6Mcydx4K5j6I5nChla98CJ1qVGR53LlyAm1zfHplHVVaiTVeXMpgtDpu7Bp5Gu bo60CWJXi5bF1P4moqBdNi4PIDma5Z7kpiNOFwEgTTr0Av7ihhxO+jKqrL9+6kvOUrEH zhrGuCb98lyLBxqhCL+dA4s/tCI7Lo7niSNcm3V6+7sXhCLiosTZQ+tB7CJ+GJhG9OtK 7sG2zrIRTbqqwDROrmQFEdHiOnIBfPrJsM8v+AJUZ3zWf2GjP9GAs+u/EbkXh7SUhX6W Rd8g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=kgviUW7J; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id b82si804772wmh.82.2017.07.06.10.35.34; Thu, 06 Jul 2017 10:35:34 -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; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=kgviUW7J; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E3DD9689880; Thu, 6 Jul 2017 20:35:16 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf0-f67.google.com (mail-lf0-f67.google.com [209.85.215.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 396E268981A for ; Thu, 6 Jul 2017 20:35:11 +0300 (EEST) Received: by mail-lf0-f67.google.com with SMTP id t72so1344715lff.0 for ; Thu, 06 Jul 2017 10:35:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=PlCaeyiK5s+yqjIi0rqUd04ffmVXV5EwpfV8GsakDgE=; b=kgviUW7JkT5MfSffUvGYvu+3FtjsZeUCI2CcGZbXZpGepA50pG4+0x7AutLqTdhT6x GpXhZQpJXcPiK4l7MiU0CJkb1VzKlqXxtJ69m++CYMXCtPA3IoU6d8hwIU7We3AfW8c1 KCtu7zwbftwwCivIrtrtx6uQwjVgphtUXZ5jUwJ195hHj2JV5Y3rUt87kOgxeGM0l42c b5UKZG1ug1cc+CouaUYaz6/VFTgC8ue5055HG+7gxzPbLiMRZec1LdPNNOVjiHmcxRRB 33k6eL8Uoy0YYvQuR7Ok1EqZGT4WMoYgBj89qXBuvrIUFqSk+u0mT3pcJf0ne+pjIjZ8 lO7A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=PlCaeyiK5s+yqjIi0rqUd04ffmVXV5EwpfV8GsakDgE=; b=WEQ15j+k09BWNyZIVduCGsjtffxMEKkr9Iu6fsz50LNzHAamC4iEGMIA3+sfdbyaB5 RuPo+36G6hzOTQ3Ph8/iuap6Ib6Iy4fymvBpZORSJprhf1zcyOeZpRPTjpEz5I176aGU Q5vQnRPX23/aC5kJyMh5psKov/wdiMvKxWgE8S+eODEwETnlgtHBKc51lhNyXZzv7t9y oEWjqiLh0TvSpsnh2cbDJOfSwtBh+HnGzqV32l8JhTCWYkLmXqVK9eeVSHsGIsbLOsti if3sggQxmAlACBhctMxnTnnTYa/Doj7eVWkvFW6lhTsIB1p1XNCY1XuhL///DIpquD7J mscQ== X-Gm-Message-State: AIVw111zzp7AdwhxJs0ya9m0YP2beWf3tQYvwMovIsn44ZxRG0c9EeO2 P8e32rs13ExhHk71O/g= X-Received: by 10.80.163.150 with SMTP id s22mr222028edb.18.1499362513394; Thu, 06 Jul 2017 10:35:13 -0700 (PDT) Received: from localhost.localdomain ([62.208.38.79]) by smtp.gmail.com with ESMTPSA id i42sm407991ede.5.2017.07.06.10.35.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 06 Jul 2017 10:35:12 -0700 (PDT) From: Derek Buitenhuis To: ffmpeg-devel@ffmpeg.org Date: Thu, 6 Jul 2017 18:34:21 +0100 Message-Id: <20170706173421.1257-3-derek.buitenhuis@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170706173421.1257-1-derek.buitenhuis@gmail.com> References: <20170706173421.1257-1-derek.buitenhuis@gmail.com> Subject: [FFmpeg-devel] [PATCH 2/2] mpegtsenc: Don't pass NULL to memcpy 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Derek Buitenhuis --- libavformat/mpegtsenc.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c index acea2e93a6..f62ed55dea 100644 --- a/libavformat/mpegtsenc.c +++ b/libavformat/mpegtsenc.c @@ -277,6 +277,8 @@ static void putstr8(uint8_t **q_ptr, const char *str, int write_len) len = strlen(str); if (write_len) *q++ = len; + if (!str) + return; memcpy(q, str, len); q += len; *q_ptr = q;