kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

FS-2081 --resolve

This commit is contained in:
Marc Olivier Chouinard 2011-12-15 23:36:20 -05:00
parent 04295ac95b
commit 4cd616cc1d
1 changed files with 46 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/switch_xml.c
View File

@ -101,6 +101,9 @@ void globfree(glob_t *);
#define SWITCH_XML_WS "\t\r\n " /* whitespace */
#define SWITCH_XML_ERRL 128 /* maximum error string length */
/* Use UTF-8 as the general encoding */
#define USE_UTF_8_ENCODING SWITCH_TRUE
static int preprocess(const char *cwd, const char *file, int write_fd, int rlevel);
typedef struct switch_xml_root *switch_xml_root_t;
@ -2238,6 +2241,8 @@ static char *switch_xml_ampencode(const char *s, switch_size_t len, char **dst,
{
const char *e = NULL;
int immune = 0;
int expecting_x_utf_8_char = 0;
int unicode_char = 0x000000;
if (!(s && *s))
return *dst;
@ -2290,8 +2295,48 @@ static char *switch_xml_ampencode(const char *s, switch_size_t len, char **dst,
*dlen += sprintf(*dst + *dlen, "
");
break;
default:
if (USE_UTF_8_ENCODING && expecting_x_utf_8_char == 0 && ((*s >> 8) & 0x01)) {
int num = 1;
for (;num<4;num++) {
if (! ((*s >> (7-num)) & 0x01)) {
break;
}
}
switch (num) {
case 2:
unicode_char = *s & 0x1f;
break;
case 3:
unicode_char = *s & 0x0f;
break;
case 4:
unicode_char = *s & 0x07;
break;
default:
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Invalid UTF-8 Initial charactere, skip it\n");
/* ERROR HERE */
break;
}
expecting_x_utf_8_char = num - 1;
} else if (USE_UTF_8_ENCODING && expecting_x_utf_8_char > 0) {
if (((*s >> 6) & 0x03) == 0x2) {
unicode_char = unicode_char << 6;
unicode_char = unicode_char | (*s & 0x3f);
} else {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Invalid UTF-8 character to ampersand, skip it\n");
expecting_x_utf_8_char = 0;
break;
}
expecting_x_utf_8_char--;
if (expecting_x_utf_8_char == 0) {
*dlen += sprintf(*dst + *dlen, "&#x%X;", unicode_char);
}
} else {
(*dst)[(*dlen)++] = *s;
}
}
s++;
}
return *dst;