pidgin/pidgin

Merged in dequisdequis/pidgin/release-2.x.y (pull request #213)
release-2.x.y
2017-06-16, Gary Kramlich
43d73148b489
Parents 28aa86aaba9387fff7866cff
Children e058717505e2
Merged in dequisdequis/pidgin/release-2.x.y (pull request #213)

purple_markup_unescape_entity: Fix handling of hexadecimal html entities

Approved-by: Eion Robb
Approved-by: Gary Kramlich
Approved-by: Mike Ruprecht
1 files changed, 2 insertions(+), 3 deletions(-)
  • +2 -3
    libpurple/util.c
    • --- a/libpurple/util.c Thu Jul 16 14:11:57 2015 -0400
    +++ b/libpurple/util.c Fri Jun 16 23:43:30 2017 +0000
    @@ -950,8 +950,7 @@
    purple_markup_unescape_entity(const char *text, int *length)
    {
    const char *pln;
    - int len, pound;
    - char temp[2];
    + int len;
    if (!text || *text != '&')
    return NULL;
    @@ -974,7 +973,7 @@
    pln = "\302\256"; /* or use g_unichar_to_utf8(0xae); */
    else if(IS_ENTITY("'"))
    pln = "\'";
    - else if(text[1] == '#' && g_ascii_isxdigit(text[2])) {
    + else if(text[1] == '#' && (g_ascii_isxdigit(text[2]) || text[2] == 'x')) {
    static char buf[7];
    const char *start = text + 2;
    char *end;