retronetworking
/
freeswitch
13
0
Fork 0
Code Pull Requests Releases Activity

[core] remember if a tag is parsed from CDATA

This commit is contained in:
Seven Du 2019-11-16 10:33:48 +08:00 committed by Andrey Volk
parent 5df8bfcd84
commit 917d850b04
4 changed files with 83 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/include/switch_xml.h
View File

@ -69,7 +69,8 @@ SWITCH_BEGIN_EXTERN_C
SWITCH_XML_ROOT = (1 << 0), // root
SWITCH_XML_NAMEM = (1 << 1), // name is malloced
SWITCH_XML_TXTM = (1 << 2), // txt is malloced
SWITCH_XML_DUP = (1 << 3) // attribute name and value are strduped
SWITCH_XML_DUP = (1 << 3), // attribute name and value are strduped
SWITCH_XML_CDATA = (1 << 4) // body is in CDATA
} switch_xml_flag_t;
/*! \brief A representation of an XML tree */

8
src/switch_xml.c
View File

@ -1139,10 +1139,14 @@ SWITCH_DECLARE(switch_xml_t) switch_xml_parse_str(char *s, switch_size_t len)
if (!(s = strstr(s + 3, "--")) || (*(s += 2) != '>' && *s) || (!*s && e != '>'))
return switch_xml_err(root, d, "unclosed <!--");
} else if (!strncmp(s, "![CDATA[", 8)) { /* cdata */
if ((s = strstr(s, "]]>")))
if ((s = strstr(s, "]]>"))) {
if (root && root->cur) {
root->cur->flags |= SWITCH_XML_CDATA;
}
switch_xml_char_content(root, d + 8, (s += 2) - d - 10, 'c');
else
} else {
return switch_xml_err(root, d, "unclosed <![CDATA[");
}
} else if (!strncmp(s, "!DOCTYPE", 8)) { /* dtd */
for (l = 0; *s && ((!l && *s != '>') || (l && (*s != ']' || *(s + strspn(s + 1, SWITCH_XML_WS) + 1) != '>'))); l = (*s == '[') ? 1 : l)
s += strcspn(s + 1, "[]>") + 1;

2
tests/unit/Makefile.am
View File

@ -1,7 +1,7 @@
include $(top_srcdir)/build/modmake.rulesam
noinst_PROGRAMS = switch_event switch_hash switch_ivr_originate switch_utils switch_core switch_console switch_vpx switch_core_file \
switch_ivr_play_say switch_core_codec switch_rtp
switch_ivr_play_say switch_core_codec switch_rtp switch_xml
noinst_PROGRAMS+= switch_core_video switch_core_db
AM_LDFLAGS = -avoid-version -no-undefined $(SWITCH_AM_LDFLAGS) $(openssl_LIBS)
AM_LDFLAGS += $(FREESWITCH_LIBS) $(switch_builddir)/libfreeswitch.la $(CORE_LIBS) $(APR_LIBS)

74
tests/unit/switch_xml.c Normal file
View File

@ -0,0 +1,74 @@
/*
* FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
* Copyright (C) 2005-2019, Anthony Minessale II <anthm@freeswitch.org>
*
* Version: MPL 1.1
*
* The contents of this file are subject to the Mozilla Public License Version
* 1.1 (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
* http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
* The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
*
* The Initial Developer of the Original Code is
* Anthony Minessale II <anthm@freeswitch.org>
* Portions created by the Initial Developer are Copyright (C)
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
* Chris Rienzo <chris@signalwire.com>
* Seven Du <dujinfang@gmail.com>
*
*
* switch_xml.c -- tests core xml functions
*
*/
#include <switch.h>
#include <stdlib.h>
#include <test/switch_test.h>
FST_MINCORE_BEGIN()
{
FST_SUITE_BEGIN(switch_xml)
{
FST_SETUP_BEGIN()
{
}
FST_SETUP_END()
FST_TEARDOWN_BEGIN()
{
}
FST_TEARDOWN_END()
FST_TEST_BEGIN(test_cdata)
{
const char *text = "<xml><![CDATA[Tom & Jerry]]></xml>";
switch_xml_t xml = switch_xml_parse_str_dynamic((char *)text, SWITCH_TRUE);
fst_requires(xml);
fst_check(xml->flags & SWITCH_XML_CDATA);
switch_xml_free(xml);
text = "<xml><tag><![CDATA[Tom & Jerry]]></tag></xml>";
xml = switch_xml_parse_str_dynamic((char *)text, SWITCH_TRUE);
fst_requires(xml);
fst_check((xml->flags & SWITCH_XML_CDATA) == 0);
xml = xml->child;
fst_check_string_equals(xml->name, "tag");
fst_check(xml->flags & SWITCH_XML_CDATA);
switch_xml_free(xml);
}
FST_TEST_END()
}
FST_SUITE_END()
}
FST_MINCORE_END()