From patchwork Thu Mar 4 17:48:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Jan_Ekstr=C3=B6m?= X-Patchwork-Id: 26098 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 25D2044A146 for ; Thu, 4 Mar 2021 19:48:42 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0B97D68ABFE; Thu, 4 Mar 2021 19:48:42 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lj1-f177.google.com (mail-lj1-f177.google.com [209.85.208.177]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5D7A268ABDA for ; Thu, 4 Mar 2021 19:48:35 +0200 (EET) Received: by mail-lj1-f177.google.com with SMTP id a17so34430452ljq.2 for ; Thu, 04 Mar 2021 09:48:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=CO757h3pud/O4zoxvoiGCGcSzpz6g83NKGO9D9oiwVo=; b=m6jbKhsbZ+yQMmc3vdM467sgaFrj/aGNSGIjflvY2FCT1iMyplN62V3/8bDSFDL/00 McpOCO8+4AxL7oRApkOWkvRJPI0WPgFAPake0yD31EDKBoaIAXoNyE0KKsL9zc2BZt8J Z1CmS1aQWYIPdZgCSmvCGbCvIEJL1/zmpyZQbNlw9VaWn32x8+GUo1lmTOtbmZqhxsT4 cahLXLLPtdSpkJ9oJ0tnhmQf8IIIFb4S7MsrLItvF0sBIDfGxWyex2UeDoxjdA4r5oU/ bRnze/mCueXIUcwmYxLz5wZSnJ7KYVQhXijunN345iyv4Yl0jLQijFbSryt4AkPn7Ebi VPuQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=CO757h3pud/O4zoxvoiGCGcSzpz6g83NKGO9D9oiwVo=; b=QaHNfUGxzUbN0/r8Bj3aHi1yV4A+3QSi//kH3qWaKg0tvPGZpReX0B1oIwFrEhlhb6 gkeMj5qhkP70i+qTtmOVEkVPlW47Gqh1L3MVgrFlF9x/qE6pwJCCiOMy7KNrof3O5jLG CZ/LyV6TwXCofHVUo7v4AUifgYUzCCiWhf5zl0xUMZQxAgbg/C6xXDH6RmZxjVhbMAVt 1YrCT4Marja7ZwUw6fj44BCs3VidsRHvGVteO1ye8ePfUAdYJ7LNZc4Q9AAYhcmo1oll twH2VEbX0q7sok4kQzjbMiy4g6lhE3xoabayC2X8aKQ+SRomJOAXnLDrcZqTRJZBaLIY j4Bw== X-Gm-Message-State: AOAM531ZWcZAS+5zAfQ7HUsDuwKAJ/Hdg0qF6+SnfWb3iC3s15jTQPAQ YrUzZbOiRJdJer7kPmeNAABgPN4b1Xk= X-Google-Smtp-Source: ABdhPJzIi6MsD/GevD26msuON07KEDPlUL03SSfoOBgQRDRPlTLzcKZGRZ19I0UpYDo/X8GnNhIdXA== X-Received: by 2002:a05:651c:387:: with SMTP id e7mr2919789ljp.425.1614880114620; Thu, 04 Mar 2021 09:48:34 -0800 (PST) Received: from localhost.localdomain (91-159-194-103.elisa-laajakaista.fi. [91.159.194.103]) by smtp.gmail.com with ESMTPSA id n25sm9549lfe.86.2021.03.04.09.48.34 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Mar 2021 09:48:34 -0800 (PST) From: =?utf-8?q?Jan_Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Thu, 4 Mar 2021 19:48:27 +0200 Message-Id: <20210304174830.53798-3-jeebjp@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210304174830.53798-1-jeebjp@gmail.com> References: <20210304174830.53798-1-jeebjp@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v7 2/5] ffprobe: switch to av_bprint_escape for XML escaping 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Jan Ekström Additionally update the result of the ffprobe XML writing test. Signed-off-by: Jan Ekström --- fftools/ffprobe.c | 32 +++++++++++--------------------- tests/ref/fate/ffprobe_xml | 2 +- 2 files changed, 12 insertions(+), 22 deletions(-) diff --git a/fftools/ffprobe.c b/fftools/ffprobe.c index 740e759958..1eb9d88b5e 100644 --- a/fftools/ffprobe.c +++ b/fftools/ffprobe.c @@ -1672,24 +1672,6 @@ static av_cold int xml_init(WriterContext *wctx) return 0; } -static const char *xml_escape_str(AVBPrint *dst, const char *src, void *log_ctx) -{ - const char *p; - - for (p = src; *p; p++) { - switch (*p) { - case '&' : av_bprintf(dst, "%s", "&"); break; - case '<' : av_bprintf(dst, "%s", "<"); break; - case '>' : av_bprintf(dst, "%s", ">"); break; - case '"' : av_bprintf(dst, "%s", """); break; - case '\'': av_bprintf(dst, "%s", "'"); break; - default: av_bprint_chars(dst, *p, 1); - } - } - - return dst->str; -} - #define XML_INDENT() printf("%*c", xml->indent_level * 4, ' ') static void xml_print_section_header(WriterContext *wctx) @@ -1761,14 +1743,22 @@ static void xml_print_str(WriterContext *wctx, const char *key, const char *valu if (section->flags & SECTION_FLAG_HAS_VARIABLE_FIELDS) { XML_INDENT(); + av_bprint_escape(&buf, key, NULL, + AV_ESCAPE_MODE_XML, AV_ESCAPE_FLAG_XML_DOUBLE_QUOTES); printf("<%s key=\"%s\"", - section->element_name, xml_escape_str(&buf, key, wctx)); + section->element_name, buf.str); av_bprint_clear(&buf); - printf(" value=\"%s\"/>\n", xml_escape_str(&buf, value, wctx)); + + av_bprint_escape(&buf, value, NULL, + AV_ESCAPE_MODE_XML, AV_ESCAPE_FLAG_XML_DOUBLE_QUOTES); + printf(" value=\"%s\"/>\n", buf.str); } else { if (wctx->nb_item[wctx->level]) printf(" "); - printf("%s=\"%s\"", key, xml_escape_str(&buf, value, wctx)); + + av_bprint_escape(&buf, value, NULL, + AV_ESCAPE_MODE_XML, AV_ESCAPE_FLAG_XML_DOUBLE_QUOTES); + printf("%s=\"%s\"", key, buf.str); } av_bprint_finalize(&buf, NULL); diff --git a/tests/ref/fate/ffprobe_xml b/tests/ref/fate/ffprobe_xml index 1e99158021..04261ed693 100644 --- a/tests/ref/fate/ffprobe_xml +++ b/tests/ref/fate/ffprobe_xml @@ -51,7 +51,7 @@ - +