From patchwork Thu Jul 6 18:55:54 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Derek Buitenhuis X-Patchwork-Id: 4244 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.1.76 with SMTP id 73csp2549007vsb; Thu, 6 Jul 2017 11:56:45 -0700 (PDT) X-Received: by 10.28.50.70 with SMTP id y67mr425640wmy.62.1499367404923; Thu, 06 Jul 2017 11:56:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1499367404; cv=none; d=google.com; s=arc-20160816; b=tfUWcq1TsbeudwUbosReyBfe7ZueIwJKDPlN1+8gD81gKx197ViEa25cjrYvcEtxsh S4PRHLYgkBRDWDTaNlvsKeR8v4l1/p9S5R6/2OpIp+RP3Pn5ziQbsKmu/pwFSand9ckV D3saWVyy0vzFqnKop5tIdwe6CEQjEmMM/jfadIQpuSfqNIAne577Lw1DeRnfCN1C4gmr f3ECJazratcdXCjzS4UaFqpfQxavITxPOp0ueRaUz3YTyhEN+BIro//YM7rLrIKPmp1J Ovz7AS7L7sfvmdU69nmAd/jUWW8moVPVEBFdXHIJkRkl7+UXtH2UdF9AQAJ0iPyDVf8C Y+oQ== 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=yhiqMrCnLLwgcg1mu3ZcEN4b5yvwhmfXd6Je6g8jqmI=; b=z6tZEed2n4qwu+8mk9nrIz7myqzZ/VaW1QmM1CcrOkKitV5bZRAWr1+Uyh/rpA6uZ9 s7FHRoqeP5kV4QAMyiK9HS34oRtoN8jhjxt6mktl248NbJrXOq4gUR1Jjnx2SUvEGBpe f40HcB3Foj2rH/amdShRoliey/TCLlQ8Nh1yRkEpizKmglO4Oe/e7tFsOtl83Hetsx6V RM6iZZJzyZcOY9ei+KHRCNL4lLAUFwZBrp0uq02h7B0htk8jemN/VhXPn+eEROVQZUR8 0mlCExq/EUCS08VIz9L3DffF/jqS6oziid5ve1lW5SFvwMiPGufZSDGdifxUx/HZNKKl WhiA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=e/8prZqo; 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 e3si933204wmd.89.2017.07.06.11.56.44; Thu, 06 Jul 2017 11:56:44 -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=e/8prZqo; 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 5F8976899C1; Thu, 6 Jul 2017 21:56:39 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf0-f65.google.com (mail-lf0-f65.google.com [209.85.215.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 509746898D3 for ; Thu, 6 Jul 2017 21:56:38 +0300 (EEST) Received: by mail-lf0-f65.google.com with SMTP id f28so1545316lfi.3 for ; Thu, 06 Jul 2017 11:56:41 -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=oBDMe+u7uq+dbSxuhV+sh9BcbN/oQBfusGHDYfS5fk8=; b=e/8prZqoU2zWJyKsMNFygbQ/xBEywhOJ2vVhfeD+RKupSxbul8Kf8sL/LoNiYb6fpb xTJal7X6kxcp5JcQ58Qrm3jiDvwwJ5D0cb65gv9Y/NGlitdA6vL914SCxzYWIuzWn+/j qGs4k18v2/xCknUtMOVTthk6wNqCj/yWBwYVU3Rvmhq+p7WMXo5pX3Ni8DmOq8t8rlud bdwdAK0WUmiHj9AN+7zN/bSwd+6SuCMQbOLBUkG8Y/SZ18jCa2g8Qk6TabZXHabHdG6+ lPv9W7vNjK16dJ9zL+B6ADdCGz/2/TU/MEI5uPzu3ZspMHPwRwTxzHkpvhoQBRh5Sq8O AceA== 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=oBDMe+u7uq+dbSxuhV+sh9BcbN/oQBfusGHDYfS5fk8=; b=QfDlAJ29zLUDZNADcydWpIj1uBi0ZiEF8cgqNvTW3gn52cwjLu4cyj1h2MsUZQLuiO 6L3UIkUMPbCyS2+JMFKQt8Dn3SLR6hczZx5i96nLxnwxRWpn3GiGTuM5pOEBn5xvcYXl ub+3yk+3Kqziv+Sb6Gydaip4OMPvwKAB6aN4va1R466oEANUpHPdc92KPbjsdiFXuFuw Opuln0OkHYUSG+VTJu4Bm8ZfSh8XPKUDPNllFg77ZgD2NEN1M5SGeGUbNcc8VEfXYUuu 4WucP7WYW9y7TJmnknlh2HL+Bwuk/2+Jmy9tqVywKqAvc6D2X6GAxICHtq+4ogC67p8B V+7w== X-Gm-Message-State: AIVw110CffefxdTC+Cz84PdpKMoXREsa10eS4IULkEpgwteCrjWjUMds z4w6bNR+iLyJjaz8X+0= X-Received: by 10.80.182.180 with SMTP id d49mr432879ede.56.1499367400263; Thu, 06 Jul 2017 11:56:40 -0700 (PDT) Received: from localhost.localdomain ([62.208.38.79]) by smtp.gmail.com with ESMTPSA id w49sm505238eda.61.2017.07.06.11.56.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 06 Jul 2017 11:56:39 -0700 (PDT) From: Derek Buitenhuis To: ffmpeg-devel@ffmpeg.org Date: Thu, 6 Jul 2017 19:55:54 +0100 Message-Id: <20170706185554.3529-1-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 v2] 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 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c index acea2e93a6..fdfa544ee2 100644 --- a/libavformat/mpegtsenc.c +++ b/libavformat/mpegtsenc.c @@ -277,6 +277,10 @@ static void putstr8(uint8_t **q_ptr, const char *str, int write_len) len = strlen(str); if (write_len) *q++ = len; + if (!str) { + *q_ptr = q; + return; + } memcpy(q, str, len); q += len; *q_ptr = q;