From patchwork Thu Nov 7 11:37:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 16153 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 8E6D1449B47 for ; Thu, 7 Nov 2019 13:37:57 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6BC2D68998A; Thu, 7 Nov 2019 13:37:57 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f196.google.com (mail-pf1-f196.google.com [209.85.210.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6531068998A for ; Thu, 7 Nov 2019 13:37:50 +0200 (EET) Received: by mail-pf1-f196.google.com with SMTP id r4so2529512pfl.7 for ; Thu, 07 Nov 2019 03:37:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=fbgMqjEHfuh/ehdjSfw+1i8kCxhukfD7NSPyPSNXNFY=; b=FE6sCyZInqFWykqBbYwYDxKPH+w+kKfGxSHglBJhn27FLMwVMOEtlNDmtNPejABOZ0 qLt6K1MvuvHQjzfgrdzBgFTDBBV/wPh0YnTmD52bAs1soGECjWnsSpv4loucpEZuUbvZ RocnLiZEI5gG13Nc3AjElRBDlBN9h8bpFtbPWoh8hXMwptHpt33xNsOq/GBkp3MuMlsQ J3DDX9lar6BZPNphW5ypkgceuP7RazHxHDW5eJXJESkGAGZ6fdQkMwtEqnRxj6cl/xJR w5ysvFqgWgVqLac+nJzND8qML1G/EdV3s74/zyWAzC8arT00NypR4RegZTuYaepzCHKs UD1Q== 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:in-reply-to :references; bh=fbgMqjEHfuh/ehdjSfw+1i8kCxhukfD7NSPyPSNXNFY=; b=MToiG9eRROrcftqIi7DsIBLC4q69tR92N5PPExVq34ZW40nZBIbW+2MnjWtdoG168k Z5ooYa3Fqr0p9AVYP2V+HPU8ABY0z+habwg3+PuWVP/PSudSoNG8OdSsc2dqDNUGJfy3 S0w7VXGWJa671q+fotGcJKeA8XK+al2LPZky9qZ6FKB9V2Db+6aKdoX0HfrQR2k9Ta27 nZ9FK3HQTUauk+M2ouh8N/u8cNGHx0FX4Hko+53OOe+iviCzYezmawCIPgLqnLyAOnqN y9tOcDDSI3rLvY+pH0JODgB4hhpYkyIOh7cz842zpTWQa5CSdj6YejZtEbobB5xJOO58 xmdA== X-Gm-Message-State: APjAAAXHUh4x6mobTueu0/X5RT/4sb3wS0OZzl3Nyj9RgZSADLa5gnl6 URgR25pCfpMAk3Q3wFJvWuPx4+e69Bw= X-Google-Smtp-Source: APXvYqwrRwlWqvUviTiVrBM89sg9Y/Zkq+HhY8Q5bzzQPO41UrPVQMFagt34UqnmQb4kdS912CLiAA== X-Received: by 2002:a63:9d0f:: with SMTP id i15mr4002927pgd.286.1573126668573; Thu, 07 Nov 2019 03:37:48 -0800 (PST) Received: from vpn.localdomain ([47.90.99.151]) by smtp.gmail.com with ESMTPSA id a21sm2230147pjq.1.2019.11.07.03.37.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Nov 2019 03:37:48 -0800 (PST) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Thu, 7 Nov 2019 19:37:43 +0800 Message-Id: <20191107113743.24476-1-lance.lmwang@gmail.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20191029094520.30679-1-onemda@gmail.com> References: <20191029094520.30679-1-onemda@gmail.com> Subject: [FFmpeg-devel] [PATCH v3] avformat/mp3dec: Fixes misdetection of zYLx.wav 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: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Limin Wang Signed-off-by: Limin Wang --- libavformat/mp3dec.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavformat/mp3dec.c b/libavformat/mp3dec.c index 258f19174b..f15045dd6f 100644 --- a/libavformat/mp3dec.c +++ b/libavformat/mp3dec.c @@ -73,6 +73,7 @@ static int mp3_read_probe(const AVProbeData *p) int frames, ret; int framesizes, max_framesizes; uint32_t header; + uint32_t next; const uint8_t *buf, *buf0, *buf2, *end; buf0 = p->buf; @@ -93,6 +94,10 @@ static int mp3_read_probe(const AVProbeData *p) ret = avpriv_mpegaudio_decode_header(&h, header); if (ret != 0) break; + next = AV_RB32(buf2 + 4); + /* detect invalid data after header */ + if ((header & 0xfffe0000) == (next & 0xfffe0000)) + break; buf2 += h.frame_size; framesizes += h.frame_size; }