From patchwork Tue Aug 20 01:36:48 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niki Bowe X-Patchwork-Id: 14603 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 9F8A1446CFE for ; Tue, 20 Aug 2019 04:37:04 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7E07768A96E; Tue, 20 Aug 2019 04:37:04 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-vs1-f73.google.com (mail-vs1-f73.google.com [209.85.217.73]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 00EA8689B6D for ; Tue, 20 Aug 2019 04:36:57 +0300 (EEST) Received: by mail-vs1-f73.google.com with SMTP id a20so1450860vso.15 for ; Mon, 19 Aug 2019 18:36:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:message-id:mime-version:subject:from:to:cc; bh=OteFLEzWxt/nlH3KjLzbpu3RiJrd9RC46ZjrvGtu508=; b=SNWU9uopi3I5iLXKEGrD+vnx33xdPWq/WZQUV0VW7qBDa/2vsdTyxWNO7qVCAUT/CB 0sIr63XcYxL94GUpVCj7loGXoPuob5o2e5sfa2d+jS5yUlYwBSkj5zIRRnh5UhF2d2Hd OtbOaNWrV09RIN2qzvZ55RlmVg7cEzsff4m+7otoY/l8vRAbPiLj5Cpy9bUORTJJw2tf g1BuiTUvzlgpOvI+0DhsHqqPDF5ZfRs0rW5wV47mpCxi/R2HNN4BS23693ebYPSaLFC2 GG+MmhETfRGIIsJg0VUm0GF971XjcOpu0SYgW54JrD3/UdPhWfy8w+MvPQAGMGlp1q84 pxAA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:mime-version:subject:from:to:cc; bh=OteFLEzWxt/nlH3KjLzbpu3RiJrd9RC46ZjrvGtu508=; b=OA76EkhzlFpDSl9rIo8CVp7IqCe8I1q1dpK72fgBMpwZ/F9B4aQm3omUA5IbEQYsfv eKzBDvb7ukRuPibzNBWgwTFBx4xlfKxQEj/BhKrl/jBOUTWDgX5c2stujfD6DaZuCGJX g/EEAYNjmOTrsjJ6Lsc+WdIelBHLCYCLuCEszgsGhdwxauYgda9/tsTX9hwbUdjWJFM9 3Dmg06TYUR6VXCHruBYomaTfmvSAY+w6YnR0g5Dc9B2YN5LnhWgNSOv354UAEDkltTNn p252wwAtug+HWwj2Z2IAbYOaGbuukCJpjBiKV7KLCdPZ2R6I9QN9H0CWQf3UAG3r63Py EMmg== X-Gm-Message-State: APjAAAXqxwKHSIu9Xn+nFgxZN8Zz52KHU1u3LG7ViQ6AlFbngQ1985lp 34dXDpR0V7ATCQVnffZ2MRQfuQwpo2dy5M8PpPzSzS3tQMi1xyaL9FHGMTDUWYQMuMmuf8Hw2Cx /ZOx75hn7S3j6XFDJYGScIOCP431jgsxNHGSItzTn9BEnGuaupqapOdd0l5EA X-Google-Smtp-Source: APXvYqz9NkgNanKj1+y8yEF51ADjWS59prqNbFzii+7YjntghK9d6ecPDemE4CRPBUbzFBNLsQUJh+3LOw== X-Received: by 2002:a05:6102:7c1:: with SMTP id y1mr6933633vsg.217.1566265016187; Mon, 19 Aug 2019 18:36:56 -0700 (PDT) Date: Mon, 19 Aug 2019 18:36:48 -0700 Message-Id: <20190820013648.161805-1-nbowe@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.23.0.rc1.153.gdeed80330f-goog From: Nikolas Bowe To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH] avformat: Fix probing on some JPEGs 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: Nikolas Bowe Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Fixes "Invalid data found when processing input" on some JPEGs. Some large extensionless JPEGs can get probe score collisions. eg $ ffprobe -loglevel trace /tmp/foo [NULL @ 0x55c130ab04c0] Opening '/tmp/foo' for reading [file @ 0x55c130ab0f40] Setting default whitelist 'file,crypto' Probing jpeg_pipe score:6 size:2048 Probing jpeg_pipe score:6 size:4096 Probing jpeg_pipe score:6 size:8192 Probing jpeg_pipe score:6 size:16384 Probing jpeg_pipe score:25 size:32768 Probing jpeg_pipe score:25 size:65536 Probing jpeg_pipe score:25 size:131072 Probing jpeg_pipe score:25 size:262144 Probing jpeg_pipe score:25 size:524288 Probing mpeg score:25 size:1048576 Probing jpeg_pipe score:25 size:1048576 [AVIOContext @ 0x55c130ab9300] Statistics: 1048576 bytes read, 0 seeks /tmp/foo: Invalid data found when processing input This patch fixes this by bumping the score in the start-of-scan data. --- Fixes adsadasda asd libavformat/img2dec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/img2dec.c b/libavformat/img2dec.c index f8b4a655a5..cb582f97cb 100644 --- a/libavformat/img2dec.c +++ b/libavformat/img2dec.c @@ -767,7 +767,7 @@ static int jpeg_probe(const AVProbeData *p) if (state == EOI) return AVPROBE_SCORE_EXTENSION + 1; if (state == SOS) - return AVPROBE_SCORE_EXTENSION / 2; + return AVPROBE_SCORE_EXTENSION / 2 + 1; return AVPROBE_SCORE_EXTENSION / 8; }