From patchwork Mon Feb 22 13:19:12 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: 25894 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 D94D144A67C for ; Mon, 22 Feb 2021 15:25:36 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C260668AA13; Mon, 22 Feb 2021 15:25:36 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f43.google.com (mail-ed1-f43.google.com [209.85.208.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 152D768AA13 for ; Mon, 22 Feb 2021 15:25:30 +0200 (EET) Received: by mail-ed1-f43.google.com with SMTP id i14so21634931eds.8 for ; Mon, 22 Feb 2021 05:25:30 -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=T9NanDi8fBl4JQTecYlvXME0L0Ypt7sKuPhi4tlploc=; b=R3c5uoFfgUEKeTp/xxoXSzB33JM6Nzj7czLhc8mepF7k6ksFLMyrFLxfIc85JQFbIo SpD8+Ma1z5GAH2GXeqan9sjfjaq41Ze1FDbRyyxQfSuyqvFl/Q4f8rTaLc/Kfrh2kSgf g1wWLNoOebzO9vG12mSAPndH1UJWzkKlGaky8D9+ZfmGEN+Gt5xfmqJEL8cHqSyLxbIN uLO7qbDIAZ6zIaSQs3TD3w4Fj4WZ8aUQGe6bd+iZAMRbydjEUWs5WP2au/6vRGB3ZCja OkjRTLhEzU71u0pW3pmJtNkK9pZN5bYKMip6i89fT+9oU2telObssTeVr2R9oHim6i+3 Xx3Q== 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=T9NanDi8fBl4JQTecYlvXME0L0Ypt7sKuPhi4tlploc=; b=RqRUb662vNY+lpClLjwyXRM34oG0bTwcd0Zgp27IXKozgmtzcZXhg0qj5+DQWiniWR YlbtNuPpsTzEAs0enYVDsovOxLIfxIy8cBwHT760Y0Kqgy+tnCV43ZKo2f0khHJ6Axt6 dlKtf083gI+T/bOF5VTAqNXf8vkQZ/Grdd24S5wxLca6JhnR9YZZfhzrpB/rw6JpvkRu aHQD/VtAElKY+mWvUE/gb/bG2aZ7iafrU9L71WypHlzWVCr4Vw90iWN1bJRlZ6kPrPZf HeZaUj1LwMmc9+l4FxLg9dIWbql8SJoSQBAdiv93c4yqePg2ExJQrhUwy/5AdCl6aPiJ LkbA== X-Gm-Message-State: AOAM5338w7MGOm4ZvOrSaNjcWo8NNqvMqQeWHJDc7f3sJRNqCx4JYapv XLzGEf42icLTuNhCWShF3C5REc8szlQ= X-Google-Smtp-Source: ABdhPJyCAVpn80IQbZ+Hh5m0EqhwPk9BukXQDKQ9K7kSM7kz4v9SjVG8ndMhtnXEwlbLWyPyAvhTKA== X-Received: by 2002:a2e:8619:: with SMTP id a25mr591563lji.234.1613999959017; Mon, 22 Feb 2021 05:19:19 -0800 (PST) Received: from localhost.localdomain (91-159-194-103.elisa-laajakaista.fi. [91.159.194.103]) by smtp.gmail.com with ESMTPSA id v26sm750256lfd.6.2021.02.22.05.19.18 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Feb 2021 05:19:18 -0800 (PST) From: =?utf-8?q?Jan_Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Mon, 22 Feb 2021 15:19:12 +0200 Message-Id: <20210222131914.21335-3-jeebjp@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210222131914.21335-1-jeebjp@gmail.com> References: <20210222131914.21335-1-jeebjp@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v5 2/4] 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 3453aa09ff..7635f781a6 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 ccea2874b2..bfff7bc332 100644 --- a/tests/ref/fate/ffprobe_xml +++ b/tests/ref/fate/ffprobe_xml @@ -51,7 +51,7 @@ - +