From patchwork Thu May 25 17:32:06 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 3740 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.10.2 with SMTP id 2csp901100vsk; Thu, 25 May 2017 10:32:22 -0700 (PDT) X-Received: by 10.28.41.65 with SMTP id p62mr10272556wmp.32.1495733542723; Thu, 25 May 2017 10:32:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1495733542; cv=none; d=google.com; s=arc-20160816; b=p2VPhW6pJyt4nSwNuMlkIw5gl3yy4SEf7lWl4gRMY+AJV4XIicPvcewkDM8rM1n1b3 ESuGCpYMIUxTjellobRff2WIyZuQKx7zjttTVTfxVfVZbSPMDYo0Ksx8a74R7qzS2OqO YcPCAXIpmfsSH64gZRwI0YOh8NHfaxguES7fNGaTJYRKZ5yKbTvrjXMnPPp6o6ApmSnR 7Ulh5m0jMUhcSOsZnycY+fEiyCB6v0Dhcbie/lm0D6Mh39Zj/+I3VmzIZ+Jj0C5qZ8b3 sEFCzPxz8zpUFwgtnYU4J16/NuIOp5iKkJS39zIvH6eejFQNfPkcHXtyyyWEk1GrDp1b /SEg== 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=UK0hFicaSQPtW72G97DsAioE7Ovsm3+fdOSfI/R9z+Q=; b=bd4bFzYISlckcSSbpqkIcgkiansR50uITMgPjqol/W1vupsGglKb6HQ/TWwYGuiWuD Ut7k7Pr/18ZFrkSHXcFca3B12F3RaT6svbQqaEgzKm3e8o3yRvrK74zt7mSuAJd6mG1v rHP9txYO9DiLcMANxPf+gvRYlQqsnzSeZPjX6xYAndg8wL9itxdPMTNLNPCNcAbYD7NW 1vofZ1XekWd6Y0JP1nJ0aZfaG1JmwsgWt2GxNahmpYShS7s53+NUumry9CWQIRnEaEMB rFf5V1G8PpqZ93MvYuCbjKf4yGVzUGBUpZ4V/4ZsA1q0MnDfM9VsJavQ3Q/6fxhD7uX2 j0Yg== 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 y73si10476002wmd.145.2017.05.25.10.32.22; Thu, 25 May 2017 10:32:22 -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 5171E689A69; Thu, 25 May 2017 20:32:16 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe05-1.mx.upcmail.net (vie01a-dmta-pe08-1.mx.upcmail.net [84.116.36.20]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 69CA4689811 for ; Thu, 25 May 2017 20:32:10 +0300 (EEST) Received: from [172.31.216.43] (helo=vie01a-pemc-psmtp-pe01) by vie01a-dmta-pe08.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1dDwcO-0004OA-8J for ffmpeg-devel@ffmpeg.org; Thu, 25 May 2017 19:32:12 +0200 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id QhY71v0010S5wYM01hY8yW; Thu, 25 May 2017 19:32:08 +0200 X-SourceIP: 213.47.41.20 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Thu, 25 May 2017 19:32:06 +0200 Message-Id: <20170525173206.27425-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.13.0 Subject: [FFmpeg-devel] [PATCH] avcodec/htmlsubtitles: Be a bit more picky on syntax 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" This reduces the number of strstr() calls per byte Fixes timeout Fixes: 1817/clusterfuzz-testcase-minimized-5104230530547712 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/htmlsubtitles.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/htmlsubtitles.c b/libavcodec/htmlsubtitles.c index 16295daa0c..e69681f31c 100644 --- a/libavcodec/htmlsubtitles.c +++ b/libavcodec/htmlsubtitles.c @@ -92,7 +92,7 @@ int ff_htmlmarkup_to_ass(void *log_ctx, AVBPrint *dst, const char *in) case '<': tag_close = in[1] == '/'; len = 0; - if (sscanf(in+tag_close+1, "%127[^>]>%n", buffer, &len) >= 1 && len > 0) { + if (sscanf(in+tag_close+1, "%127[^<>]>%n", buffer, &len) >= 1 && len > 0) { const char *tagname = buffer; while (*tagname == ' ') tagname++; @@ -149,7 +149,7 @@ int ff_htmlmarkup_to_ass(void *log_ctx, AVBPrint *dst, const char *in) } } else if (tagname[0] && !tagname[1] && strspn(tagname, "bisu") == 1) { av_bprintf(dst, "{\\%c%d}", tagname[0], !tag_close); - } else { + } else if (*tagname) { unknown = 1; snprintf(tmp, sizeof(tmp), "", tagname); }