From patchwork Sun Oct 23 16:29:03 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Cadhalpun X-Patchwork-Id: 1146 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.133 with SMTP id o127csp1837754vsd; Sun, 23 Oct 2016 09:29:13 -0700 (PDT) X-Received: by 10.28.10.149 with SMTP id 143mr10897857wmk.12.1477240153663; Sun, 23 Oct 2016 09:29: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 m1si8065153wmm.23.2016.10.23.09.29.12; Sun, 23 Oct 2016 09:29: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=@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 19620689CCA; Sun, 23 Oct 2016 19:29:08 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f67.google.com (mail-wm0-f67.google.com [74.125.82.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 86935689B73 for ; Sun, 23 Oct 2016 19:29:01 +0300 (EEST) Received: by mail-wm0-f67.google.com with SMTP id o81so6272697wma.2 for ; Sun, 23 Oct 2016 09:29:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20120113; h=from:subject:to:references:message-id:date:user-agent:mime-version :in-reply-to:content-transfer-encoding; bh=79FaqiTxklghwM1/ysDl6SO2Csr6eoYXu2UBrHlgL3c=; b=r9AT2anrRqFM5V8Y03vRZ0tbS+Kbw7R1cfjsXn7uRcsLbW4A3alXkj8Zxwh14elRbV Y5CsZuEDrdx7a7JJ7XDmDvmrWqoDTQ9AT7JSM+DST2vfrw5a1IFHnhzBwgOYyE+uSeyf HxlxYN3rOVwB/OD+l7JB1cafNwe260YgvIxQBP5dLen8V24jJld2fW10aimH+tNBj/ov Q8j9TMFfU2rLt/yIyOtxbl4zk3SYaKutroDG/wwMjRVmHCFDj7trAVadvVKrPvco9lz8 NVbxt2DW7zdEmHQIZiFCkaPKdyS/29O/YRBOSoAfVKley4TPKo7dWTgdLixOiPyTMPaF kgmw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:subject:to:references:message-id:date :user-agent:mime-version:in-reply-to:content-transfer-encoding; bh=79FaqiTxklghwM1/ysDl6SO2Csr6eoYXu2UBrHlgL3c=; b=EtvumDFGOOQ8+0SlGOIzNm9qSfLvFHKzMBb988Fd26r4PlJ/AB6HCft7wMNIXqknd4 py7nB/GjwxQLsobaoAmtkwDzbUZEmkFgf6Mz690lx4tlqcJ+cLMSVuwj/PRGz/ZNC1J1 Fmo5NTQU0DMnOiaKodQ+V80encOgv3I0256yE/3xp1fIUhQRqJWB08VxxnNjmPtsjm7B 6iYcYNU4xcMv/kw5/iEWQfSOn/OK3w+DkFkaUggaoqcq1H112IJRSWqiu16ZY7Ft+YMl 6virTA4KdCOf99gC4CpgrhSZ/Ea8Lf/03E0gm3kCFvFbVwLrQiWGKT2xlypg97uAxOVg olNw== X-Gm-Message-State: ABUngveI/8ov01NGdsWaJzQaZK3sdDe6BjSimR0QdjhNg2wp2waRv364BDRNunZjg/xpJg== X-Received: by 10.194.106.169 with SMTP id gv9mr8250555wjb.129.1477240144278; Sun, 23 Oct 2016 09:29:04 -0700 (PDT) Received: from [192.168.2.21] (p5B095E5A.dip0.t-ipconnect.de. [91.9.94.90]) by smtp.googlemail.com with ESMTPSA id vf8sm14540982wjc.27.2016.10.23.09.29.03 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 23 Oct 2016 09:29:03 -0700 (PDT) From: Andreas Cadhalpun X-Google-Original-From: Andreas Cadhalpun To: FFmpeg development discussions and patches References: <6622a3c7-3900-8982-1179-4ccdd0fec2b3@googlemail.com> Message-ID: <51c74359-03d8-9a80-6126-3818e131a8c6@googlemail.com> Date: Sun, 23 Oct 2016 18:29:03 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Icedove/45.4.0 MIME-Version: 1.0 In-Reply-To: <6622a3c7-3900-8982-1179-4ccdd0fec2b3@googlemail.com> Subject: [FFmpeg-devel] [PATCH 06/12] mov: validate sidx timescale 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" A negative timescale doesn't make sense and triggers assertions in av_rescale_rnd. Signed-off-by: Andreas Cadhalpun --- libavformat/mov.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavformat/mov.c b/libavformat/mov.c index 6f313a5..413675f 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -4233,6 +4233,11 @@ static int mov_read_sidx(MOVContext *c, AVIOContext *pb, MOVAtom atom) timescale = av_make_q(1, avio_rb32(pb)); + if (timescale.den <= 0) { + av_log(c->fc, AV_LOG_ERROR, "Invalid sidx timescale 1/%d\n", timescale.den); + return AVERROR_INVALIDDATA; + } + if (version == 0) { pts = avio_rb32(pb); offset += avio_rb32(pb);