From patchwork Thu Nov 17 21:52:30 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Cadhalpun X-Patchwork-Id: 1464 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.90.1 with SMTP id o1csp1019026vsb; Thu, 17 Nov 2016 13:52:41 -0800 (PST) X-Received: by 10.28.185.203 with SMTP id j194mr6301280wmf.73.1479419561345; Thu, 17 Nov 2016 13:52:41 -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 f84si4485690wmi.127.2016.11.17.13.52.40; Thu, 17 Nov 2016 13:52:41 -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 55795689F1B; Thu, 17 Nov 2016 23:52:37 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f66.google.com (mail-wm0-f66.google.com [74.125.82.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4B38E6899AF for ; Thu, 17 Nov 2016 23:52:31 +0200 (EET) Received: by mail-wm0-f66.google.com with SMTP id u144so25389123wmu.0 for ; Thu, 17 Nov 2016 13:52:32 -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=tstU4gzGDZdigqvG6BUaQL7Z4YN3nYlEsUkokRkHiNk=; b=jsVpQJ8ae2kFy9KyDa2db/Nf9ZvxNBpfsTBdnIPXYvDXRlDfoxdkw5psKEqvI9+Yfv E0UQfKVIZXYM01P188VCiM+Oy+mLC8HcMy9cBc86pICw4S1DAZM+BtGjqGk224XMURgD fJoE7qCOFWQP1Ka8Dg5N7xAnLccz80WUXALYa9M8qSbA/R0A/RD5XDfHlumWMIY3EbDr NgHJG3Z16rTCjEOIa0Tv3g83GjFxfk3e5RTf9ouaDArkZFIRkagfR4E5zJCrgAenuOB9 UHx/1jjEttfmOTk0O4shSZYbYgMGh21eVz48GVpqX7Ig8JfSAA1L4ieHKCcEDWw/sx1i c/GQ== 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=tstU4gzGDZdigqvG6BUaQL7Z4YN3nYlEsUkokRkHiNk=; b=Qbq4k5/vN5rOyNG26LBlfbL0TWLVVWUjhx/DKSTXdKKX20E3W6WFttSiVQdLSDbbK8 yxJlAeLn42AypZR3Ki5/n50wKBC7w41hud6XB1+xjoZqMYzt25E6BiKRQW+dbWlvDUST JYOH7YWVpCj2p4mO7koVNIzoyCB2UycF3b5+aOcNGm7RkWenXvx/Ge9UZaIwTWND2JNG jM3s0KI3Z64GEZWVEkP3BPPsI+3cKQoo2kbRroHwTw9I8IGDXZhW+vxan8vwcYViMFoK WDrsSPR8ALGeO794XoShpKcMn6X2EZ7SzXWRCN8yczIADSByggzzMPCzeMUkCryhuiJP D0Sw== X-Gm-Message-State: ABUngvf0QAF5BgD3mPseS563of+qBsrVHwmOuYhHDkE61bYZJhUSVZHAVgOJawgCwiXKlQ== X-Received: by 10.28.172.68 with SMTP id v65mr17957888wme.99.1479419552039; Thu, 17 Nov 2016 13:52:32 -0800 (PST) Received: from [192.168.2.21] (pD9E8F8EC.dip0.t-ipconnect.de. [217.232.248.236]) by smtp.googlemail.com with ESMTPSA id k11sm5881817wmb.18.2016.11.17.13.52.31 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 17 Nov 2016 13:52:31 -0800 (PST) From: Andreas Cadhalpun X-Google-Original-From: Andreas Cadhalpun To: FFmpeg development discussions and patches Message-ID: <1e1bc327-9adf-4d35-ed43-5da07f4c2971@googlemail.com> Date: Thu, 17 Nov 2016 22:52:30 +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] rmdec: validate block alignment 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" This fixes division by zero crashes. Signed-off-by: Andreas Cadhalpun --- libavformat/rmdec.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavformat/rmdec.c b/libavformat/rmdec.c index d175862..4d56529 100644 --- a/libavformat/rmdec.c +++ b/libavformat/rmdec.c @@ -934,6 +934,10 @@ ff_rm_parse_packet (AVFormatContext *s, AVIOContext *pb, ast->sub_packet_cnt = 0; rm->audio_stream_num = st->index; + if (st->codecpar->block_align <= 0) { + av_log(s, AV_LOG_ERROR, "Invalid block alignment %d\n", st->codecpar->block_align); + return AVERROR_INVALIDDATA; + } rm->audio_pkt_cnt = h * w / st->codecpar->block_align; } else if ((ast->deint_id == DEINT_ID_VBRF) || (ast->deint_id == DEINT_ID_VBRS)) {