diff options
| author | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2019-01-24 14:53:51 +0000 |
|---|---|---|
| committer | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2019-01-24 14:53:51 +0000 |
| commit | b50b9693911632124d3209770cfe4c1366283395 (patch) | |
| tree | 988b7ea80bba5f16c0d8a41acc32b6ef2a816d17 | |
| parent | 8d757de7fdd3bbf9a16e244acb60e13de3187699 (diff) | |
| download | rspamd-b50b9693911632124d3209770cfe4c1366283395.tar.gz rspamd-b50b9693911632124d3209770cfe4c1366283395.zip | |
[Fix] HTML: Another entities decoding logic fix
| -rw-r--r-- | src/libserver/html.c | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/src/libserver/html.c b/src/libserver/html.c index 63d913762..400ae3d89 100644 --- a/src/libserver/html.c +++ b/src/libserver/html.c @@ -343,7 +343,8 @@ rspamd_html_decode_entitles_inplace (gchar *s, gsize len) gchar *t = s, *h = s, *e = s, *end_ptr; const gchar *end; const gchar *entity; - gint state = 0, val, base; + gint state = 0, base; + UChar32 uc; khiter_t k; if (len == 0) { @@ -409,10 +410,10 @@ rspamd_html_decode_entitles_inplace (gchar *s, gsize len) base = 10; } if (base == 10) { - val = strtoul ((e + 2), &end_ptr, base); + uc = strtoul ((e + 2), &end_ptr, base); } else { - val = strtoul ((e + 3), &end_ptr, base); + uc = strtoul ((e + 3), &end_ptr, base); } if (end_ptr != NULL && *end_ptr != '\0') { @@ -424,7 +425,7 @@ rspamd_html_decode_entitles_inplace (gchar *s, gsize len) } else { /* Search for a replacement */ - k = kh_get (entity_by_number, html_entity_by_number, val); + k = kh_get (entity_by_number, html_entity_by_number, uc); if (k != kh_end (html_entity_by_number)) { if (kh_val (html_entity_by_number, k)) { @@ -444,11 +445,15 @@ rspamd_html_decode_entitles_inplace (gchar *s, gsize len) } else { /* Unicode point */ - if (g_unichar_isgraph (val)) { - t += g_unichar_to_utf8 (val, t); + goffset off = t - s; + UBool is_error = 0; + + U8_APPEND (s, off, len, uc, is_error); + if (!is_error) { + t = s + off; } else { - /* Leave unknown entities as is */ + /* Leave invalid entities as is */ if (end - t >= h - e) { memmove (t, e, h - e); t += h - e; |