From patchwork Thu Apr 20 12:14:42 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Derek Buitenhuis X-Patchwork-Id: 3450 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.3.129 with SMTP id 123csp772886vsd; Thu, 20 Apr 2017 05:22:13 -0700 (PDT) X-Received: by 10.223.131.226 with SMTP id 89mr8061138wre.111.1492690933775; Thu, 20 Apr 2017 05:22:13 -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 b21si8868347wra.74.2017.04.20.05.22.13; Thu, 20 Apr 2017 05:22:13 -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; 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 41A0D6898BC; Thu, 20 Apr 2017 15:22:02 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f68.google.com (mail-wm0-f68.google.com [74.125.82.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3189568831A for ; Thu, 20 Apr 2017 15:21:56 +0300 (EEST) Received: by mail-wm0-f68.google.com with SMTP id u65so2777056wmu.3 for ; Thu, 20 Apr 2017 05:22:05 -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=Ht24fjBC3X8fo8YSqHi5f29gnVvcqTe6j3fiPxBP+SY=; b=r4WCUyRzgM6nkFA7b9uHsWiXClIZWwnBtlPsZm4gy5mB83g1+DY1I7S/mpyaB2z3+9 oEo/+mTijq1w1FkeQXr6Hekd76l3jD/QW1k7bBKQT8FiXiZQwEjVPkUdDeGOH2y0YuTA /dorg62DNhWwtYu/MMpOU+Pci7oHxNbcJgS0ArJh+q81ai/ZjUjTCfdvrAsObfpaPILL XGcQPYNA6bNYeoYPBezd/Px6yOgatklUS0pSyT6b3kTJdvw54jCw7aqdJKpVSCu92YVk VhDrUHdcmDlhqmvQJhGp3lhWiZeZH7r9lmbJ1yyDD0JiSKsOr6mr16jIjFjz03u1UgNf tlbQ== 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=Ht24fjBC3X8fo8YSqHi5f29gnVvcqTe6j3fiPxBP+SY=; b=GFtHh0tjSYNVtZAI10pCL7t5YZ+kYSe1qFp5izuKm/rr7brmC3+Y8ZXSXhcnjENKai nE2gXF4MgNaCv0AhwuvInQXz3qmT7dXnRcybQEP8y8aLlJ7Ew0VsohgsiTLKYGgy3cYs NGe5yXKBnRQT6zaVFbW2vlImpT5/I68S9k9curDXwkDzfrWfv8IcSpIK/sNpAjRXOUoS n1LJY+mHe3GNq7k7y2rqPzzfN/QG/T9etmUtCei8fKKrVkeMdkTnSh79iAnSVesYXO+E LWatDoWVw38JZahMC655tVF3weYR1E25D2QrJlgEift2DEdAALtTIovubuUlZsQjgJwi u8CA== X-Gm-Message-State: AN3rC/6yzN17+JkVWrO0KkRoSHn9e/AnoXCmXhBcWbATFWOruMXJuIGc d22Dv5YbD89uIQ== X-Received: by 10.28.222.70 with SMTP id v67mr2800529wmg.65.1492690518673; Thu, 20 Apr 2017 05:15:18 -0700 (PDT) Received: from vimeo-vm.localdomain ([82.129.105.223]) by smtp.googlemail.com with ESMTPSA id d8sm26754ede.65.2017.04.20.05.15.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 20 Apr 2017 05:15:18 -0700 (PDT) From: Derek Buitenhuis To: ffmpeg-devel@ffmpeg.org Date: Thu, 20 Apr 2017 13:14:42 +0100 Message-Id: <1492690483-37511-2-git-send-email-derek.buitenhuis@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1492690483-37511-1-git-send-email-derek.buitenhuis@gmail.com> References: <1492690483-37511-1-git-send-email-derek.buitenhuis@gmail.com> Subject: [FFmpeg-devel] [PATCH 1/2] webmdashenc: Require the 'adaptation_sets' option to be ste 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" This seems to be non-optional, and if the muxer is run without it, strlen() is run on NULL, causing a segfault. Signed-off-by: Derek Buitenhuis --- libavformat/webmdashenc.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavformat/webmdashenc.c b/libavformat/webmdashenc.c index 602726c..2f5c31e 100644 --- a/libavformat/webmdashenc.c +++ b/libavformat/webmdashenc.c @@ -433,6 +433,10 @@ static int parse_adaptation_sets(AVFormatContext *s) char *p = w->adaptation_sets; char *q; enum { new_set, parsed_id, parsing_streams } state; + if (!(w->adaptation_sets)) { + av_log(s, AV_LOG_ERROR, "The 'adaptation_sets' option must be set.\n"); + return AVERROR_INVALIDDATA; + } // syntax id=0,streams=0,1,2 id=1,streams=3,4 and so on state = new_set; while (p < w->adaptation_sets + strlen(w->adaptation_sets)) {