From patchwork Fri Jan 22 11:20:57 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: 25111 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:ab61:0:0:0:0:0 with SMTP id u88csp1083169ybi; Fri, 22 Jan 2021 03:21:42 -0800 (PST) X-Google-Smtp-Source: ABdhPJzsS1cw0Hxti9X/qb/46oYtS6Akn/lD2gD/n9UoWcHjO18/J9wG8YXKm1HcZ1Kh/4OM2rgy X-Received: by 2002:a17:907:9483:: with SMTP id dm3mr2623571ejc.120.1611314502627; Fri, 22 Jan 2021 03:21:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1611314502; cv=none; d=google.com; s=arc-20160816; b=gMJAnDAYhrjMvQQ9S9W1hE+fv6QY7gtIXrzppq+nFojfJP9yEHnjQAvG7tSh5WEyN+ eeO0L6QEnEFE8ejTv1olQEwmpzV8iGVlqAZJ1Zb3IM9L5GmR8/MFJlkefIz9w2rqnWBW tdp0qR/XhW5QwWtWkqd7eWw7ljislqCVxqFikh5dy5wswE6KU+BI0Sz5kTPkZIXNzn0N WZVIOmSBfMfCrKP9/MJjOIRVoOW0dKtUHOP+JaPRgCB0McN0fMnIT3kt8B1jTU7K3EbD HstazXDhBo/u2s3UM9kgCCu/T/fAvLjOuqlqEbsVCLEQ1lAp3UwSYULluQcg8v4D+fqK CICg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=8OW33ikSsV3YYfGV/KeUfJyI5O8iv7JOD1zdsRH2+Po=; b=p2JGk113lLPpiXkfqwakBtYTkvXQeBNMMoaQpBCsv/1vrckKcXU4gYiBt2OpmCA3BN azNzhA4VmjCdcOkOZtyux+XHRojcDmN3uNRLOYLhhsqMdHaZMK4kZn3MMpFDIIsCSczE Fx6ygaklZq48KEyHYCC2tsSnvJ73L9Tt3+oqCyEPsKNleABemsZjff2G4JO8ZJq92OQk 2rYU7zF3zI2PffH8CSjZ0uJ0hrKy5D7k5dZ8chlPQUU8OZ1uk7hFygqHvNJIeuBUPHuk 9dgzzd0B9V67itL3U8aqIq1Wrt1dtGSK7Y+BUB7NLr3JDRGtJvV42z/qr4pywiqXVLMp lanw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=UHKuqO6M; 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=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id i2si829186ejp.556.2021.01.22.03.21.42; Fri, 22 Jan 2021 03:21:42 -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=@gmail.com header.s=20161025 header.b=UHKuqO6M; 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=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 00C8B68A4F6; Fri, 22 Jan 2021 13:21:13 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f43.google.com (mail-lf1-f43.google.com [209.85.167.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B595968A3A3 for ; Fri, 22 Jan 2021 13:21:04 +0200 (EET) Received: by mail-lf1-f43.google.com with SMTP id p21so1926444lfu.11 for ; Fri, 22 Jan 2021 03:21:04 -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=d+GsYG0luftTFVKPAOu8CheXsfq4BSaskskUyq1RYpg=; b=UHKuqO6MfW3iIX9eSbfeKITeAJu1Z/630lsSLUMwNSrlGgN8b7IyGqh0TLX/ENaeA1 ljF5yB2cNkf9g+UdZFRTLa2EU72VkDMQGGka6Z3/+JLzFzJDmz9mtImy0NuvImydLHMB sJPqqd6x8M0LpXAZHyF5+6K0mCj3kDtsdD31+1qPvTib3Ya36ed/lU0w6qbt5IG+TolL 5beKReDcsABv8QofS0f6MTsYnl9DTilLGlhBjaPizPs7mx73q+ADtPWnrWQroQ+OTujt RP71eZX7rGzKC/pKEbQbze1hSo6HoymIkaFYLo1FsWe1vYp7em/p/F/zMdMR1OFS9hz9 kXfg== 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=d+GsYG0luftTFVKPAOu8CheXsfq4BSaskskUyq1RYpg=; b=iExBAAcNTOWpPvD7oAhiCP3f1ryU0gGsfnVvEp5xJj4BEf8B0vEdDpOkYAOGUcXlrx AbJFD0XMUFCnt0rbQzo7jBZq+d4tcIIYbW6anZZTfgKTIBsKLDCBCRWnDLF9khRwY8dW +OYscP/3znYQwuDhOQjY9GBg6A3ib5CDjeO7yZWkmNUNVN4lz4TZ/D4ToBHtl7u+Fi1h CWpEwYOa3xKnyxarA9CNglW9rEIjQKzuscaRauZfliHUR2bgd3+7aVUMYv1LzSlZgc0w gR80NhYXc0p3wI2lw5GtDYDqby68fzQ8CAxJ7iR/ipEYnKGlOMKJOAST65PDl6deUvUR zFyg== X-Gm-Message-State: AOAM531ioG3/yQPi9aD6OV4zKSfTu+3Fs8+rd4QmWNr0u+Jp3qUngt8c cPpohFTPyskUHIouRunSdvqbRG8PsUI= X-Received: by 2002:a05:6512:3397:: with SMTP id h23mr367670lfg.103.1611314464161; Fri, 22 Jan 2021 03:21:04 -0800 (PST) Received: from localhost.localdomain (91-159-194-103.elisa-laajakaista.fi. [91.159.194.103]) by smtp.gmail.com with ESMTPSA id v24sm919451ljc.56.2021.01.22.03.21.03 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Jan 2021 03:21:03 -0800 (PST) From: =?utf-8?q?Jan_Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Fri, 22 Jan 2021 13:20:57 +0200 Message-Id: <20210122112058.49068-4-jeebjp@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210122112058.49068-1-jeebjp@gmail.com> References: <20210122103725.24370-1-jeebjp@gmail.com> <20210122112058.49068-1-jeebjp@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v4 3/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" X-TUID: 1RYDOG7sXwRd Content-Length: 4548 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..564c062331 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_ATT_VALUE_DOUBLE_QUOTED, 0); 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_ATT_VALUE_DOUBLE_QUOTED, 0); + 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_ATT_VALUE_DOUBLE_QUOTED, 0); + 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..78e6af7a33 100644 --- a/tests/ref/fate/ffprobe_xml +++ b/tests/ref/fate/ffprobe_xml @@ -51,7 +51,7 @@ - +