From patchwork Tue Mar 5 00:05:46 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 12194 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 45A1E448C71 for ; Tue, 5 Mar 2019 02:07:43 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 25C06689CD4; Tue, 5 Mar 2019 02:07:43 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-qmta-pe02-1.mx.upcmail.net (vie01a-qmta-pe02-1.mx.upcmail.net [62.179.121.181]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 649F668050E for ; Tue, 5 Mar 2019 02:07:37 +0200 (EET) Received: from [172.31.218.44] (helo=vie01a-dmta-pe05-2.mx.upcmail.net) by vie01a-pqmta-pe02.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1h0xcO-0006lb-40 for ffmpeg-devel@ffmpeg.org; Tue, 05 Mar 2019 01:07:36 +0100 Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe05.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1h0xcI-0001WA-0U for ffmpeg-devel@ffmpeg.org; Tue, 05 Mar 2019 01:07:30 +0100 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id 0xbJhZ6iB2WSs0xbJhy9k7; Tue, 05 Mar 2019 01:06:30 +0100 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.41.20 X-CNFS-Analysis: v=2.3 cv=E7kcWpVl c=1 sm=1 tr=0 a=I1eytVlZLDX1BM2VTtTtSw==:117 a=I1eytVlZLDX1BM2VTtTtSw==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=pGLkceISAAAA:8 a=oIQHSV-yOxq2pMUJEVQA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Tue, 5 Mar 2019 01:05:46 +0100 Message-Id: <20190305000546.5886-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 X-CMAE-Envelope: MS4wfNWbpaP7lQi/fTjYjQkuCeUo/cxob1Yn9ZOIVTF7yoOx44DboIH5GjteF3R4P2WScQLt9BPtHIVreZdO+8/XbnoqldsBoDy0y4JFRUg9VO6ZBnpqcsmY SDplMdBJP5tFTtqAKyXOgQmeyZHM26F6oIIyydfhQ87nhpKrTNgCNR8ctuuQpNQPuT0b2UJY7yY4Pbnj3G0MNIs57iicdZUd3Ns= Subject: [FFmpeg-devel] [PATCH] avformat/gdv: Check fps 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 Cc: Anatoly Trosinenko Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Fixes: Division by 0 Fixes: ffmpeg_zero_division.bin Found-by: Anatoly Trosinenko Signed-off-by: Michael Niedermayer --- libavformat/gdv.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavformat/gdv.c b/libavformat/gdv.c index a69c349cab..3ead383892 100644 --- a/libavformat/gdv.c +++ b/libavformat/gdv.c @@ -86,6 +86,9 @@ static int gdv_read_header(AVFormatContext *ctx) vst->nb_frames = avio_rl16(pb); fps = avio_rl16(pb); + if (!fps) + return AVERROR_INVALIDDATA; + snd_flags = avio_rl16(pb); if (snd_flags & 1) { ast = avformat_new_stream(ctx, 0);