From patchwork Mon Nov 7 23:44:56 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Cadhalpun X-Patchwork-Id: 1329 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.90.1 with SMTP id o1csp1401729vsb; Mon, 7 Nov 2016 15:45:07 -0800 (PST) X-Received: by 10.194.222.105 with SMTP id ql9mr9187832wjc.63.1478562307094; Mon, 07 Nov 2016 15:45:07 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id o7si9606525wmg.23.2016.11.07.15.45.06; Mon, 07 Nov 2016 15:45:07 -0800 (PST) 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=@googlemail.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=QUARANTINE dis=NONE) header.from=googlemail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 401DB68040A; Tue, 8 Nov 2016 01:45:01 +0200 (EET) 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 A2AD7689746 for ; Tue, 8 Nov 2016 01:44:54 +0200 (EET) Received: by mail-wm0-f68.google.com with SMTP id c17so19176496wmc.3 for ; Mon, 07 Nov 2016 15:44:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20120113; h=from:to:subject:message-id:date:user-agent:mime-version :content-transfer-encoding; bh=KHI8nDtd7n6/cFkTcOp3X3uQ1lw4+wJeH4JfEmZaccw=; b=AMrNtNNrZaOJcSm2VW2b6F4RYl1wcGtpezxC23isn7wParN/K6ctOOIMlnFB4JPTpZ n+SZa05vSSirxs2KRXT35c1f8AVqeVGRt4HshdbLHsRHVnJfDFPLH/8on24lw092pBA1 9ZHqaXMYCh3OhS2AKGpmxiVVbwNEk5lWDSErY4nKLcXuR2exF7Ti0cRJlaaX4Ie9tYTA tKcvRA3cNjzthyUw7ePZW6NM1hC6ldUXT11wK2ZVTyunobQn6kKo9JwxmRqcikYEHVy/ Q8hO0jOgD2ZhwOKo2TMN9qdIhTUf0OQT0bvCnn++06nil/v24xE06M77/PQpbG6HYRQu TeLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:message-id:date:user-agent :mime-version:content-transfer-encoding; bh=KHI8nDtd7n6/cFkTcOp3X3uQ1lw4+wJeH4JfEmZaccw=; b=U6Ftz7OKLrBMyxexh9xf5IwzVw1H1cL2aSHQhp9+AQREYJbElq2CN5Pduua146bft7 JHZHDDxAg2AQoN5YPif82enpn+3Ndg9K+eX30mR+4fV01B9WirByAL5CVI8vORHlIx+P s9QVE0ind6eTezrQIN1sbUWrotoXRd7YDNn4vFYEbEYZOXl6N+3bjZdJI6nnaXCyyNwz tl6urIb9UNYaWxM/g+uRVZzns9HkmyGA31Gkjh8BDNjTVfb8hBgagPO8yzxqfTpD8K2m HJCdyqveEfYGpN5zXEVRbdKEMSI6cLjc7EjWs9w1RSSGB+EoCl7yL342C7CQgBys9+in j6ig== X-Gm-Message-State: ABUngveYSt+UDiK19Bcw1btLFbmraQcSu+MSOUhHNbqDlcAFLLIyLCLn7DUGmfu8Mkj7sg== X-Received: by 10.194.9.34 with SMTP id w2mr7517184wja.24.1478562297542; Mon, 07 Nov 2016 15:44:57 -0800 (PST) Received: from [192.168.2.21] (p5B072203.dip0.t-ipconnect.de. [91.7.34.3]) by smtp.googlemail.com with ESMTPSA id pd2sm33706832wjb.31.2016.11.07.15.44.56 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 07 Nov 2016 15:44:57 -0800 (PST) From: Andreas Cadhalpun X-Google-Original-From: Andreas Cadhalpun To: FFmpeg development discussions and patches Message-ID: <87bfcd49-9557-aa44-73f1-1817a378afdf@googlemail.com> Date: Tue, 8 Nov 2016 00:44:56 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Icedove/45.4.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] matroskadec: fix NULL pointer dereference in webm_dash_manifest_read_header 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" The code assumes that s->streams[0] is valid. Signed-off-by: Andreas Cadhalpun --- libavformat/matroskadec.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 32f5e49..130d92e 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -3772,6 +3772,11 @@ static int webm_dash_manifest_read_header(AVFormatContext *s) av_log(s, AV_LOG_ERROR, "Failed to read file headers\n"); return -1; } + if (!s->nb_streams) { + matroska_read_close(s); + av_log(s, AV_LOG_ERROR, "No streams found\n"); + return AVERROR_INVALIDDATA; + } if (!matroska->is_live) { buf = av_asprintf("%g", matroska->duration);