From patchwork Fri Dec 4 14:46:42 2020 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: 24342 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 4DE8D44A3AF for ; Fri, 4 Dec 2020 17:10:03 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2345868A17B; Fri, 4 Dec 2020 17:10:03 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A2391689AA0 for ; Fri, 4 Dec 2020 17:09:55 +0200 (EET) Received: by mail-wr1-f41.google.com with SMTP id u12so5679172wrt.0 for ; Fri, 04 Dec 2020 07:09:55 -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=V2t3zos98zMFsXiprrEo3RI+l8uvFtw2X4kHozSKzPg=; b=C9QZ40ocCfRIGBgyS/d1Y5OFxSAe7XiMpb+zveeu9zCTZwVilTw9ZCFoK80Hh/2/eW 070AgohLGTLuGRlGr7Xvz9AMFjiaaflYddF9JXrJPsMGEASism/Lc0/Irb3LdAEjb9Wv YWEEvNVnDCRF57qq4MpHsOcGexqhdhWN+DQcfy+jG50qdTDEQpUjD9YFevbYFCQnR6wN Ml0vlGeoNkigEiBnzUCYc51D4X+JjWJxxNLSkGA+xgCebl5fjwLzlWkBYiyNV90cL+Rj ixrcg+PqqRiA7BHuFAst+On/PWroVaGdjkk/7b7BR2BbCcj1QFVsAb1O7kurWxFsfNnM eWjQ== 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=V2t3zos98zMFsXiprrEo3RI+l8uvFtw2X4kHozSKzPg=; b=DGvmy32GLaS3/zmn5+TgIdRyq0sIZfmW9zgd3/EXM44pMe58KgN0iUaXA9SXnTZr6L vrMbcjMj031vv4VbQmZYsCgYiGm/GcL3JIfrHAy7AxRAJavun0mfEa38FovRQdRTbLB3 vSnqQ42GcjT54MwPPn+/raWNe14E0OJlwv/K4YCGdQ7LdKnkzPvN3bYih7w17qklHrZI QQY8u17Z18kMp361aYz/AywZ9UkwLvUP4LowOFvkmR2yweqc0BtcfTMpORmVp0nangQH SbQckg8Wi7Z7MiBSlYsAggzfLmsGFMHDTl9bOc2uFYdQKNnU/3UGsWIrvtiko2NwNX9P vV6g== X-Gm-Message-State: AOAM533/7Qjzdcf3GOaYY2pfzpOWDTtbu+mud7eBO4TJOrJadO21fY71 i3Qn0yxizerIME+E09HjujeSNJC9mV5/3Q== X-Google-Smtp-Source: ABdhPJxzMks0MUVVitpv3+smVORpyKNoJY1kL7Znaw0SGiyQkuWJv67vJc7+vBlmuj+RHRTXbluD4g== X-Received: by 2002:a2e:b4c6:: with SMTP id r6mr3626655ljm.248.1607093208822; Fri, 04 Dec 2020 06:46:48 -0800 (PST) Received: from localhost.localdomain (91-159-194-103.elisa-laajakaista.fi. [91.159.194.103]) by smtp.gmail.com with ESMTPSA id t2sm1750308lfd.59.2020.12.04.06.46.47 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Dec 2020 06:46:48 -0800 (PST) From: =?utf-8?q?Jan_Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Fri, 4 Dec 2020 16:46:42 +0200 Message-Id: <20201204144643.73279-3-jeebjp@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201204144643.73279-1-jeebjp@gmail.com> References: <20201204144643.73279-1-jeebjp@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/3] 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 Signed-off-by: Jan Ekström --- fftools/ffprobe.c | 29 ++++++++--------------------- 1 file changed, 8 insertions(+), 21 deletions(-) diff --git a/fftools/ffprobe.c b/fftools/ffprobe.c index 86bd23d36d..a127a3f9bb 100644 --- a/fftools/ffprobe.c +++ b/fftools/ffprobe.c @@ -1671,24 +1671,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) @@ -1760,14 +1742,19 @@ 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, 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, 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, 0); + printf("%s=\"%s\"", key, buf.str); } av_bprint_finalize(&buf, NULL);