From patchwork Fri May 4 00:42:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 8770 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:155:0:0:0:0:0 with SMTP id c82-v6csp47545jad; Thu, 3 May 2018 17:43:53 -0700 (PDT) X-Google-Smtp-Source: AB8JxZo5SH+wRerPAiax0xtjarHypgruDx6sBFnFNr8ce5g5GrkGs0ABaV+NwBdzaG+dIQZxyRnH X-Received: by 2002:adf:b3d7:: with SMTP id x23-v6mr12429898wrd.142.1525394633878; Thu, 03 May 2018 17:43:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1525394633; cv=none; d=google.com; s=arc-20160816; b=hDehqJS8I/fyckAjtfLZO1H2SCQ5kOZ0kWmh5zUxOFvE/r51Y6gsBQk2W8IeaIOV59 F5+f4X4/31y40iVifvijDwYRd9/m5m04/HXshamxldHYkkaOTcqZAOoREuzSaYCQtm/S PiRaqHbSnDGf6Yam+PcoO3lhZzESgWb8tXyqKs0Ah+/0BLTfU6R2fsHVvjtw3oM7cyMw uLiWbPHXG7B92svLmg2bSuWnYBa8xkMvQII8yaFjjXUmgTJECP7PKH6WKd26cmbfYApi pf67q2DiyCi0+A43vOKndWQ+p5N3BeaW5RVrHL7T5JW0Trh6xLGhrvySzhZuodx5m+PR SFxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:delivered-to :arc-authentication-results; bh=KyQY41halYlxHj5N+72yV7Gr4hp1rmltQBitBSxWpXs=; b=RH4vp5qQ0u58eyrlRnPirDJyuxUoNWm+W/pcNe0LT/YYi3Y/ruaij8alObDeE1lJvc oZnS7/YDJ0l9eB6OOAZThb6CNjkW0xBc4QTLUQVGDso8PPM3/nyDtw0mtmjEMWr/dhSI PbpmURxp+79KI+lNWiOfL0IU4I6rczK59ByuSdBvoQjCTL1DrIs1onKrgIipZgHQ6MUv mCn5JxjdcNxQ+NEwIaviMoJoar++/Fn5WztQ0AeoFcDIVcozjIu2uIcOEWXYaGmWCO1l bEuLGOrZrD7myIaj6BJkJA++rGD/9U3WcrZAAhSHLKJrwn9ykSOdNuUQKoXOffD+kwL7 3WVQ== ARC-Authentication-Results: i=1; mx.google.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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id z9-v6si6197519wra.418.2018.05.03.17.43.52; Thu, 03 May 2018 17:43:53 -0700 (PDT) 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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9CD0E68A495; Fri, 4 May 2018 03:43:17 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-qmta-pe02-2.mx.upcmail.net (vie01a-qmta-pe02-2.mx.upcmail.net [62.179.121.182]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8487D689F32 for ; Fri, 4 May 2018 03:43:11 +0300 (EEST) Received: from [172.31.218.50] (helo=vie01a-dmta-pe07-2.mx.upcmail.net) by vie01a-pqmta-pe02.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1fEOp6-0001M2-JK for ffmpeg-devel@ffmpeg.org; Fri, 04 May 2018 02:43:44 +0200 Received: from [172.31.216.43] (helo=vie01a-pemc-psmtp-pe01) by vie01a-dmta-pe07.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1fEOp1-000706-5N for ffmpeg-devel@ffmpeg.org; Fri, 04 May 2018 02:43:39 +0200 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id i0jU1x01X0S5wYM010jVam; Fri, 04 May 2018 02:43:30 +0200 X-SourceIP: 213.47.41.20 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Fri, 4 May 2018 02:42:14 +0200 Message-Id: <20180504004214.13898-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.0 Subject: [FFmpeg-devel] [PATCH] avcodec/flac_parser: Fix infinite loop 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Fixes: crbug/827204 Reported-by: Frank Liberato Reviewed-by: Frank Liberato Signed-off-by: Michael Niedermayer --- libavcodec/flac_parser.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/libavcodec/flac_parser.c b/libavcodec/flac_parser.c index 84da23f327..2721286464 100644 --- a/libavcodec/flac_parser.c +++ b/libavcodec/flac_parser.c @@ -686,12 +686,17 @@ static int flac_parse(AVCodecParserContext *s, AVCodecContext *avctx, } for (curr = fpc->headers; curr; curr = curr->next) { - if (curr->max_score > 0 && - (!fpc->best_header || curr->max_score > fpc->best_header->max_score)) { + if (!fpc->best_header || curr->max_score > fpc->best_header->max_score) { fpc->best_header = curr; } } + if (fpc->best_header && fpc->best_header->max_score <= 0) { + // Only accept a bad header if there is no other option to continue + if (!buf_size || !buf || read_end != buf || fpc->nb_headers_buffered < FLAC_MIN_HEADERS) + fpc->best_header = NULL; + } + if (fpc->best_header) { fpc->best_header_valid = 1; if (fpc->best_header->offset > 0) {