From patchwork Sat Mar 16 10:22:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rodger Combs X-Patchwork-Id: 12322 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 2FA2A4487A4 for ; Sat, 16 Mar 2019 12:22:25 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0DB8F68A6D5; Sat, 16 Mar 2019 12:22:25 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-io1-f47.google.com (mail-io1-f47.google.com [209.85.166.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 60E73689985 for ; Sat, 16 Mar 2019 12:22:18 +0200 (EET) Received: by mail-io1-f47.google.com with SMTP id e13so194989ioq.6 for ; Sat, 16 Mar 2019 03:22:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=NZxb12+eE+yMr6kQO3rsme6rYST7xU/3+21bpvvajoc=; b=WaLdVHl9H/HCzYHlkZlJeOBlfvC4WoSW9PRuyP7VtGRYSF24X2fT3hiWknyAGLLi2p wHDX4pCV5dAJoBCW7y0lLQDr8plMs7E+o5RXJ7Y7HL8FyqlGylJ1uRGjGBbaNGZYJcnP 5mvXITEAE00yTMvIDcnujm7l9vlYFL92lskjHh59IGCuH/xpc7wj3ZM3t1Tqmzp8DNXE qlmxNW4bH/QdyTI5LOxak+DXqjcB6zRup0MpcivLngg6lhSZccvkCoyg1X11C7LJAvkv 20mkyonqHLxyBIdW0aI8WIEF2lzJwN1TCbZM+W7eYVcZ06MTfX7UzvNAlQaS8VOb2ZrI PzBw== 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:mime-version :content-transfer-encoding; bh=NZxb12+eE+yMr6kQO3rsme6rYST7xU/3+21bpvvajoc=; b=CsdFhRIpVCM1yHJQxKnX9RL3W+0ZsNpv3hAjXfftLil2kv5HghEFNYkqhTwiSVEgN2 rqhF+6JQWGKVGP705b0qA/hES5XUdRqoNALzh7TviDUY3hYYld0obcOYYqbZAxDoOE/8 shrbKnAiFi94Nae2Q2xvtsVwGTH/wW2UK4ebJ2SV35Z7o/df+vLykQ5RrMOHlQDccZsU eAo/m9d7LUHbZuXR/ck8M1NuZGcutVcDWkoZvG0wUTt2vBCdIPreqy3GPmoep7XgoT3V W/Z+pU3JtOvkKWnKju1TlYADhYC/Uvb0z3z/An63e/qXVeJO4tuhe4y0Rdy25X4T997d 9Xug== X-Gm-Message-State: APjAAAX+YyFsy6/vhEKK3FpLyGJjZmUn0Wop199jieszYz0Gj7U1V8mp jcF57wij8Q8V7FgkD3k0YjEEaynd X-Google-Smtp-Source: APXvYqyj23U8X7NnmmmsUb7eHWiYTQT0xQ5fGuG3OTh4LS6XOXEa850rz7mpf+PBlJOrfu6rtMGSnw== X-Received: by 2002:a5d:860a:: with SMTP id f10mr5472107iol.36.1552731736267; Sat, 16 Mar 2019 03:22:16 -0700 (PDT) Received: from MacBook-Pro.localdomain ([71.201.155.37]) by smtp.gmail.com with ESMTPSA id l134sm2270539itb.12.2019.03.16.03.22.14 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 16 Mar 2019 03:22:14 -0700 (PDT) From: Rodger Combs To: ffmpeg-devel@ffmpeg.org Date: Sat, 16 Mar 2019 05:22:02 -0500 Message-Id: <20190316102203.69741-1-rodger.combs@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] lavf/movdec: fix demuxing files with 0-entry trun atoms 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" Regressed in 4a9d32baca3af0d1831f9556a922c7ab5b426b10 --- libavformat/mov.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavformat/mov.c b/libavformat/mov.c index a7d444b0ee..0dfee2e7c4 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -4739,6 +4739,8 @@ static int mov_read_trun(MOVContext *c, AVIOContext *pb, MOVAtom atom) flags = avio_rb24(pb); entries = avio_rb32(pb); av_log(c->fc, AV_LOG_TRACE, "flags 0x%x entries %u\n", flags, entries); + if (entries == 0) + return 0; if ((uint64_t)entries+sc->ctts_count >= UINT_MAX/sizeof(*sc->ctts_data)) return AVERROR_INVALIDDATA;