From patchwork Tue Mar 2 09:00:38 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: 26054 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 1A46044B7BE for ; Tue, 2 Mar 2021 11:08:12 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id F32CB68AB25; Tue, 2 Mar 2021 11:08:11 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f50.google.com (mail-lf1-f50.google.com [209.85.167.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0CC6268A831 for ; Tue, 2 Mar 2021 11:08:05 +0200 (EET) Received: by mail-lf1-f50.google.com with SMTP id m22so30151349lfg.5 for ; Tue, 02 Mar 2021 01:08:05 -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=SbpF70AL+vMyOQNDFL31b1kBnvnS7M/6j8cMasexalz1rWIBaZI7u7ANyTWjWRFtpk XaWh1M0WVZL3yAqSdgckW6o9eX2dBVNao1Q258tJoeCqTofmZ4raL9dUOyRR8Emm9J8T +dLFNLSmx0zBfhNZQhCSqnOEztXQvART3jfMpRB8YJPtWksY3kfUfnwVJaHFYxld1UDj Cm8dc+0wJntdUJ8DYuxflQaDKwIlZ2CzyRrVN1T7wlFt6OejZX+Je3f7fx/Or8N4z+Nk egacbNVPHj4Bz03TF+fhaI7KCWewOKuX/RhN2KwLO2KvDkG6jbAf5oC9S2JZQi+nEA68 CwEQ== 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=FWAbbgfAtT5lfystC5uITBukLhv0xCLo5mBatb0XFvwtfbSfTJ4LCdRNAq6NEzAXUy FRxiHadBR1Dwa5GsJKeMzp+J6tgQi1Vr0dX26aWYf8LMBb1+sbfGj45Huild1ESnQL3a 9Y6MfVSPA+/7YR8tBd0F+TV6onncFvdOh9XgfT3dXILfnJ2iOK1XQryFfW32dRP/zjmy O74CBxPSNgsAnMiqXbb0KY0cNj2Tx42JZIrSz2Xni7Ke5NqGMU3NCXYg9nNRIydeSTvT /9049VMgDqeBUHrcW1dGcMjtvXKpFpNUSEp1YHd/axwswYtLV6gebC9Q7Q4l3h+FXGu7 tzSw== X-Gm-Message-State: AOAM5322Zl0l8rSPsJaoD7bTQ9fOqdH+sDEj58Dd5GKjyj0f9piarOCS ng5yojok1drBEJJb/2zPBT+HJT5/43g= X-Google-Smtp-Source: ABdhPJxYkEW20qXMywCWvTtyUnF6p5hcn9EW+Awc5tq0MMj/KNSBYEeXMX7YyqWD4qbUz0rASeeaDg== X-Received: by 2002:ac2:5e26:: with SMTP id o6mr12202242lfg.355.1614675645284; Tue, 02 Mar 2021 01:00:45 -0800 (PST) Received: from localhost.localdomain (91-159-194-103.elisa-laajakaista.fi. [91.159.194.103]) by smtp.gmail.com with ESMTPSA id u9sm1791626ljj.0.2021.03.02.01.00.44 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Mar 2021 01:00:44 -0800 (PST) From: =?utf-8?q?Jan_Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Tue, 2 Mar 2021 11:00:38 +0200 Message-Id: <20210302090040.10484-3-jeebjp@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210302090040.10484-1-jeebjp@gmail.com> References: <20210302090040.10484-1-jeebjp@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v6 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 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 @@ - +