From patchwork Thu Nov 7 11:34:19 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 16152 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 555A54490D8 for ; Thu, 7 Nov 2019 13:34:34 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 332F368B29F; Thu, 7 Nov 2019 13:34:34 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f194.google.com (mail-pl1-f194.google.com [209.85.214.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6534568B242 for ; Thu, 7 Nov 2019 13:34:27 +0200 (EET) Received: by mail-pl1-f194.google.com with SMTP id s10so1207569plp.2 for ; Thu, 07 Nov 2019 03:34:27 -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=tJx0V5N+073EQXwYx7d/BTbf5wM+ftJuilkoPZZlISSGReK3rX4I6TbgHc9vA97bNe ejEw547Ncy4z8tFN9tQ4REdfdteu62L1w1lBXFe3Q/UDOO+8O7jXIFtOWJBW6+oh1Gb5 lhwHq4Nr1TuHW8m7btU3+Ww9hNmmG5crKxutQPQRR/BAGzqj2Te5bAmkPDFvDs17LxrZ +AUftyBVyhpOB8XBaUipXMWi8xup8+28M40po9t9WcGjD5ncYg9fdCUk8wNQTZrP9+Ao /9pbc47CKrMYIKA46oq/9K5rZOe4I6tXU7IWp0JAp8zxtzdd1y3Q5gaCtbUF4PG0GNQm JA8w== 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=BIZf/Qg2EBXEjQlTEwnaSsCNLp8XDVnAGxbl+YZfL+ACQWexEVefTkmoMgJf1kaa9U c9Tw1gglmKDykMap6Ln0R2eVd1+ecFHcybLrCDG8KnSQcAHJdBFxqrMoqw/LA619OFrR k7Iu/EFb6+Vr/3+8T/1yLl5pL8RlzYOJnARK9IP94RucYDA6iii2RhZgc00I6gMA1Eiw qCqrc5uonX7Kw4BwD2asMd4LO2d3m2jp42XjLnjmTTt+kYvU4cDjzPdVDA3ILeZfU1MG IaRvsyiyzB+VXKFNjj+7vRh89pTcK0SDUfZPd6eKQd1IWe4qPCaoByJFY9ci3vm7iZe8 BqRw== X-Gm-Message-State: APjAAAVzQG7cdTPhk9InVQNDhrHfkUL7HcZ2i7IigPT10f96Q22c4rM0 L9x1Uu+OY3AnUgt970IAq8Y4KljEyFo= X-Google-Smtp-Source: APXvYqwSc6e4QbLLtu1CSQIHc7iDTeHoWOcibg9LvScKGL50IjgcWdHoSTz9cSg5Ueqt9bkYCI8i+g== X-Received: by 2002:a17:90a:aa96:: with SMTP id l22mr4267850pjq.112.1573126465481; Thu, 07 Nov 2019 03:34:25 -0800 (PST) Received: from vpn.localdomain ([47.90.99.151]) by smtp.gmail.com with ESMTPSA id s24sm2812261pfh.108.2019.11.07.03.34.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Nov 2019 03:34:24 -0800 (PST) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Thu, 7 Nov 2019 19:34:19 +0800 Message-Id: <20191107113419.24404-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/utils: 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; }