From patchwork Fri Jan 22 10:37:33 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: 25108 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:ab61:0:0:0:0:0 with SMTP id u88csp1060906ybi; Fri, 22 Jan 2021 02:43:15 -0800 (PST) X-Google-Smtp-Source: ABdhPJx8SLY2qyAcxl/7F7QbYsDEdbOa09EG6lu9y039etaC2Gf0Ow91v1SBWO+00E7XXyvw+U4+ X-Received: by 2002:a17:906:3b92:: with SMTP id u18mr2577220ejf.7.1611312195609; Fri, 22 Jan 2021 02:43:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1611312195; cv=none; d=google.com; s=arc-20160816; b=iBoahJtIkinWJ1K4Cuk/l1gw0n4q2R/2WcL/c+L04J7W8djMT+dx5lYbUdriNugJ8+ 8GJHekjnF1sQYBqz9e7yjDmh/9mgicaIxHkaB7o90/CzLJNkX0P7NEHQenzOnjdEzPVO I/U/mIh3BMRKxT38eVRgKt3I0F2/GtPPWdM0IJfRrKhAmBKrAYbe/HzmZ88mXkVD2TSx dtZmvclxc+qpyOzEdWu9ifMxKr28Lqo+7qhYgEiAqQVur6KvmIgQVA0JOKB6EW6k+c/x l9t/Uw7dMRndmSkGt4KQSeGpoIUUxl1ZyrgzWdYsMELues9S/GP/NDCpruyja8fUb39I nSGQ== 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=iy4OUMzQxJ4ZxBdWSD1v5XmK49voVPIFZpXZ3SR7Ito=; b=cdyQXTp3B1cd64K6CMKkVw+Qoah5vYhPdZzoSNKxMI4eTu2dxaoeUPOqP98Zyenhhe 9kvxx1M0eu8TyrGLcRRnbaJT7uTuU2k6m1SqG9i2OEYn260JSKSoyWfyG1FMlKEh8SNV QFdJhUgVs7d6embV95Y1SH6s/TDRg7mDLkmnqpc9+1eqDj3aaxbpGni6iHXNYMbF30MO Mnu15zAus0MmItiQ7zh1SdzrBtYljMP6eywV4D04w3e1SGlhbeXRwn/ZhdoxgFRy3qO8 +ENLjgUo6WVTxb7khkRk/I1ANYEs4oyfA55lJxRQRDq9raAmrRZh3pQDIB6+8NGQpw2g 3IYQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=hC4jC7Pf; 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 p11si2688522edh.139.2021.01.22.02.43.15; Fri, 22 Jan 2021 02:43:15 -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=hC4jC7Pf; 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 F135B68A329; Fri, 22 Jan 2021 12:43:11 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f53.google.com (mail-lf1-f53.google.com [209.85.167.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0D997680911 for ; Fri, 22 Jan 2021 12:43:04 +0200 (EET) Received: by mail-lf1-f53.google.com with SMTP id q12so6851744lfo.12 for ; Fri, 22 Jan 2021 02:43: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=xfUaZHFWslGnA5rr3bfxUXCxnwh2EGy7WvkfggPToOk=; b=hC4jC7PfNa6n4g2e4FXABupzJmN1cucaLZPrt2PKgiiMokefDtI8wGFnORh7G2WhXX MpU9qsERwK+oDkczbDkdrXQJQUdAYZRJD2LxudZoVWPUDaFy77caBgNS1DoSGUYdJ6Wl l2nwpi5UFvdz4jpsUoAdFH0y14p0oPWd5aMEfIPXHKSRkYiJ5zcYYQF6Vdnmd0fRyUj+ Z46iAvFHwKH4oUEE49WsVVFPQt/+ad8kqmhETWfWpTmN4L2cnT+5ri6Is+l16sRJ0wS6 f7RZkTbIYekN+becF+X+l/Mau1DzwWzSBxaawnKDdZHvQt1z5WkcMqz8ACiWomoE685d 3uUg== 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=xfUaZHFWslGnA5rr3bfxUXCxnwh2EGy7WvkfggPToOk=; b=t/A9aJhtx3ZMcmCb6aoneeJ0TpGFqSY7cEnHmFUKSZmFTV55daOpqIPwyyeKIsNMht q4G1/DZlQtNOPl+D0pBV2OakbEvzIbPTX76/kFjBAY7qXD8wWMySvAvgV44GQsIQjiPq VfL3dpBHMX8evFIpNQiKN1w+xjVMcGLTpzuaLNcp5CwHban/MVWMkmAfJWoqTLvnYDtR csEsCrmaKAEF5NTMRiuh39AXq6v/DQK3PNz7xA9HNrNIja3aojzr7GwtCL5ZTQrX3QHp 5Z90StFMWs2U54NwIn4d6PJgDv0NXBeKXc++XintNBOvMFztcisnTq+/jZvuW7yXVZW/ pTyA== X-Gm-Message-State: AOAM533E9ksFdQq1YWjHVFFbjdEYMswzNSwKtJ7aqkfETH+2Y6ro2kCF JIywbiDAgo0kRo64ldZmtKJx3tXeWVo= X-Received: by 2002:a05:6512:32a2:: with SMTP id q2mr296199lfe.625.1611311860293; Fri, 22 Jan 2021 02:37:40 -0800 (PST) Received: from localhost.localdomain (91-159-194-103.elisa-laajakaista.fi. [91.159.194.103]) by smtp.gmail.com with ESMTPSA id g2sm831626lfb.255.2021.01.22.02.37.39 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Jan 2021 02:37:39 -0800 (PST) From: =?utf-8?q?Jan_Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Fri, 22 Jan 2021 12:37:33 +0200 Message-Id: <20210122103734.24420-4-jeebjp@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210122103734.24420-1-jeebjp@gmail.com> References: <20210122103734.24420-1-jeebjp@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 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: k1r5Up8OW323 Content-Length: 3344 From: Jan Ekström Signed-off-by: Jan Ekström --- fftools/ffprobe.c | 32 +++++++++++--------------------- 1 file changed, 11 insertions(+), 21 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);