From patchwork Sat Jul 13 20:50:37 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andriy Gelman X-Patchwork-Id: 13937 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 CD352448711 for ; Sat, 13 Jul 2019 23:58:12 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A2D4968AD48; Sat, 13 Jul 2019 23:58:12 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f193.google.com (mail-qt1-f193.google.com [209.85.160.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 47D0E68AC04 for ; Sat, 13 Jul 2019 23:58:06 +0300 (EEST) Received: by mail-qt1-f193.google.com with SMTP id k10so11882645qtq.1 for ; Sat, 13 Jul 2019 13:58:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=TtlJLlS3S9qLIQTe/rT8IVvA/gGJNETbgqzpXNlOPbo=; b=mK7MRrEhoQHwBS3XAQz5XxP1JmZ6xH/rZwFlTjeVC27gU+Fq5g3ceC3YXKKAmCQSAb EARFlGKEkdyBjBIFdmdXdeQplMiLQ26DNqZzXyxQ82ImR6MhoWcjmWR/sywFM3OvaaNl f/87KU0sWCVCYCKuQXqsH74q4omjkv7wnnOlhOCZa+I4e4g5Sdv1eXU+IuyMMQWBSGPr hOu/Jw531XCI7KrZbbw/ul1QR6lewWVemJK3kBFjpJm+1gsy10bTYpNtRZcQ2Z9amxei jJiwpWF3b7McEfWb/Brsmsbm471BtG/DInYpv2gA5esLR6nI/XHu57sOGauJRV0MpaWX eQyg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=TtlJLlS3S9qLIQTe/rT8IVvA/gGJNETbgqzpXNlOPbo=; b=Bhgkzb4cI13zM2ibzGU/jtWfraK06qaGTfmutOVTqSCiG3XqmR23/yFG6a+2YSPA3f uJwSId6Jv/DRkLHcQ9eMZT+gG9pYT7TmEQAyJMwrI/H1Wg39MwwWuvzw1jb+qIyNeGj0 OpKwG5u4NSNvnZaTSJImw0wzghQ9Kioay44HlmFTlbDSkxVFRqBqBeCpDMT5N7v0sCvZ Pn0E7SQ4+EwseDhKmfxRKqmSyGxZH3IeUw2gjWyC/bePuumRV+Y3w2qWoOl4noktKcl1 Gjj4aWi1uhV3eLsRMdqq31ZkF6H6uK/79zqUxwcRO/5YYJ+H7FtE4Act9FoJXx0uvu3R UA5Q== X-Gm-Message-State: APjAAAXZQOLWMPA6j4Mq99ehkPd3sS7zqOSsB6ue90osln4SfEbB07Gn tHRv9D70E9qcKWXooVpW5z38aTeJ X-Google-Smtp-Source: APXvYqwZOIK7IUY37J9p5BHlZqkahwVhozuwdz3Z9Dn8mUh4WifSqGtvgphr/HqT2ODJYRQEim3KwA== X-Received: by 2002:ac8:1e8a:: with SMTP id c10mr11388886qtm.45.1563051060885; Sat, 13 Jul 2019 13:51:00 -0700 (PDT) Received: from localhost.localdomain (c-24-60-253-205.hsd1.ma.comcast.net. [24.60.253.205]) by smtp.gmail.com with ESMTPSA id z4sm7759379qtd.60.2019.07.13.13.51.00 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Sat, 13 Jul 2019 13:51:00 -0700 (PDT) From: Andriy Gelman X-Google-Original-From: Andriy Gelman To: ffmpeg-devel@ffmpeg.org Date: Sat, 13 Jul 2019 16:50:37 -0400 Message-Id: <20190713205037.17633-1-andriy.gelman@gmail.com> X-Mailer: git-send-email 2.22.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat/rawenc: avoid divide by 0 when writing adx trailer 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: Andriy Gelman Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Andriy Gelman Fixes #7985 This patch checks that the number of audio channels is not zero when writing the total sample count in adx header. --- libavformat/rawenc.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavformat/rawenc.c b/libavformat/rawenc.c index 993d232b70..bf8537fffb 100644 --- a/libavformat/rawenc.c +++ b/libavformat/rawenc.c @@ -65,6 +65,9 @@ static int adx_write_trailer(AVFormatContext *s) AVIOContext *pb = s->pb; AVCodecParameters *par = s->streams[0]->codecpar; + if (par->channels == 0) + return AVERROR_INVALIDDATA; + if (pb->seekable & AVIO_SEEKABLE_NORMAL) { int64_t file_size = avio_tell(pb); uint64_t sample_count = (file_size - 36) / par->channels / 18 * 32;