From patchwork Thu Mar 9 09:29:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: wangyaqiang <1035567130@qq.com> X-Patchwork-Id: 40618 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:d046:b0:cd:afd7:272c with SMTP id hv6csp187303pzb; Thu, 9 Mar 2023 01:29:37 -0800 (PST) X-Google-Smtp-Source: AK7set+qBcfxRNb3XYr1edxvUKTLA5cYSVTffHXgzb6gWPdVwTTmqMS+xLMP1GcPm1d/zr/vDvef X-Received: by 2002:a05:6402:1291:b0:4ad:66b:84a5 with SMTP id w17-20020a056402129100b004ad066b84a5mr19596304edv.22.1678354177652; Thu, 09 Mar 2023 01:29:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678354177; cv=none; d=google.com; s=arc-20160816; b=joBTxXTFshATqbH27/sWRslvDELZ8+SdhQ3CMtMFtol4CgRkxTpvISJdVN6PMc1vU0 jKNnqpbksRgipGYZlk7xZNYFjZmtgDsYg859smH3lkc4JDlhXa/pJWO3444v6++K+WMO cwdeEnnrYs4xDI2sK72Hqf4uoMIbkLyXiwt6FhMEU4enU9CAWWASbIWb++ofbj/MYiYQ ya5ELDQ2zeKi3xoJ7S2nawhKX9Q/9KW3xrjNjJJO7+/BlLnrkLNio78ESUfzvNg54Omh ZVp8ePgm28jAA0XtvLQGjDXWqB48xWsqd2Su7VLbaxEmdSqhP+H9A8SN+2yKTCwfaEeV O7KQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to:date :to:from:message-id:dkim-signature:delivered-to; bh=ArHMsILhW3WOnkR63Rv2CaTzFJBVmA8BiTJklFJWx+I=; b=h29NjwW47UpJ0oslEAjM9Al89giOAi9ZH4kBNPdyy+Vv4FQBetMqABI9wCPRXh227B nBwTTg+UVcp+ThnVXJnpCQt91uHpRooOhyTsekrWbQLGllhJ8Mt1N+IhBKoLyKc7G3qg D4B6loJXtGrPqGyTGAYMNo9+bhMepC+QNx8sphWXqeq0UfBuZDC71tETL0KvcZI9De1v iXotPw5G3r8C8mMushdwuM58sIQCnhmqHziFnj6YwLSu04PPf+dSEhOa1cwCI6HMx8Ky YvJ82f65CPqw50lwuVA1ajimP77U/STsFYlnR2/OdWydP2tda355k/kfHmLHf+XITVgy pSkA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@qq.com header.s=s201512 header.b=L5x8bfze; 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; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=qq.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id be15-20020a0564021a2f00b004acc137fdd5si5385067edb.48.2023.03.09.01.29.36; Thu, 09 Mar 2023 01:29:37 -0800 (PST) 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; dkim=neutral (body hash did not verify) header.i=@qq.com header.s=s201512 header.b=L5x8bfze; 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; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=qq.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 83A5368BCD5; Thu, 9 Mar 2023 11:29:33 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out162-62-57-252.mail.qq.com (out162-62-57-252.mail.qq.com [162.62.57.252]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5A73468B8C3 for ; Thu, 9 Mar 2023 11:29:26 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qq.com; s=s201512; t=1678354158; bh=QfMEMGKPFH6SUjLwRUKEFZ2BF/U+7KhK9nsSN04e+Ss=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=L5x8bfzetH70cL7XiqlbOhXZAJyAy1ZZJmMTjbxjv9/VXeBSTO5PeEMFnBFSUpZDG 4/nrHCxBSYkBwD2rl6P8f+pOBnOqOfamdIdPmomUVrXOBT7T4aZZS4NM+r1+KfSMv9 g8cc628ZpqxTNlkkS0Sk4tpj1YeiwNsWPZ1CdYIM= Received: from localhost.localdomain ([103.107.216.225]) by newxmesmtplogicsvrszc1-0.qq.com (NewEsmtp) with SMTP id 74FADC6D; Thu, 09 Mar 2023 17:29:15 +0800 X-QQ-mid: xmsmtpt1678354155t8ahwjyfr Message-ID: X-QQ-XMAILINFO: NQR8mRxMnur9J9M0sLKphB6F8BleQDaMY9swe+JWeNxcWzMnr604eiApiqemvF XUwdBlWwK4KJCU97U7fchQQSQI3c+bX+PkqgpHodY6TlU7ZzkFSgxD5MRMy0jslY8U6HW2sa0Rm2 zDylQKv4S43oJmch2kRgsdYhJkShUetqv+KPnZIrvNfy9b85psfDNvBx3TmOl2fPiUPd5/Zk1d/+ 7/me7f1f1wXXdkgKDs/WNCyYBatgwHppMJhzCgl0G+Cf1ohipY/tr5bI9dh1/A7B3Pj8A7LLBrNK PxqqPn5h0c+3KrBncjB4juKrMT56+bNrYkWfpTYEWQ4NoDyEUSIgE2GX3yIH1eznuoPpoPdyrUi3 RrI5xwx9X635wBikx8PFkGaVA8o7+NF5TkhQu/yuFjjFX9fmcPUP45xcQ2oohftfNGMibaB+WrfS u2csi98lcjgYFI0z1uMqu9sT/D+G0bXkBdVtJMYKgg132jk6/ASeFa4ImRrr8jN3WTymWAgOEO6v Gk7RkqZ4OlLx5KlZ1ACh9URqFhynXfnoKohkHeDOrEhNhvV5x17mV9UV5LuovhHLZXLt/R3M3k3C 6K4/fFBZa1mtfx3qxTtU7j/chFEgKjAeLx7+sngCnwIgaGk5mHhqlRb0qI4c1c9EQfsgkFhQR1SA vvMVOOM61UIpUMZU0jbIwGq64dEjEJXOeUAb0a1xSMXUNtk50dw8yGnj7m8np4Dbf6yPk0p0W0zT NeI4XvJvQJmHKs4//uObLW57ydQEQYEaEEa4bpYrmyXgdHJbMD16FuwYRDcIZFX+eUmLzq9YEO/9 y4ssI+zeUu964rhcQ2pxWWukdUAqDjNpg8ZKGvwjPoCGULaB97k1NM86xVOMDVw/K13LOgbFL2rk xGwaQeZ2d0OEPMnPPUVZt1Zdcof7k5YEOCYjaWYUqeZfThkd01sAoGojbvnLSwYmjQQ6GnujuR From: 1035567130@qq.com To: ffmpeg-devel@ffmpeg.org Date: Thu, 9 Mar 2023 17:29:12 +0800 X-OQ-MSGID: <20230309092912.43160-1-1035567130@qq.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2] libavformat/img2dec: fix unable to find svg format when the svg resources start with " List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Wang Yaqiang Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: dlOsZ/KpQagJ From: Wang Yaqiang svg is xml, but --- libavformat/img2dec.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/libavformat/img2dec.c b/libavformat/img2dec.c index 5a63d7c81d..3488600400 100644 --- a/libavformat/img2dec.c +++ b/libavformat/img2dec.c @@ -964,8 +964,13 @@ static int svg_probe(const AVProbeData *p) { const uint8_t *b = p->buf; const uint8_t *end = p->buf + p->buf_size; - - if (memcmp(p->buf, "= end - 5) + return 0; + if (!memcmp(b, "buf, "