diff options
| author | Vsevolod Stakhov <vsevolod@rambler-co.ru> | 2009-07-28 20:44:17 +0400 |
|---|---|---|
| committer | Vsevolod Stakhov <vsevolod@rambler-co.ru> | 2009-07-28 20:44:17 +0400 |
| commit | 80d135a1892a95ceee21b877bd6b74b3219985d8 (patch) | |
| tree | 830d24bf85c09744ee3234577aa5e4c3fe1b657f /src/html.c | |
| parent | b92225677f444858c81b9bd4900d5ddcf9eb801a (diff) | |
| download | rspamd-80d135a1892a95ceee21b877bd6b74b3219985d8.tar.gz rspamd-80d135a1892a95ceee21b877bd6b74b3219985d8.zip | |
* Fix entitles decoding for hex and oct characters
Diffstat (limited to 'src/html.c')
| -rw-r--r-- | src/html.c | 25 |
1 files changed, 21 insertions, 4 deletions
diff --git a/src/html.c b/src/html.c index 363512df1..8f5664079 100644 --- a/src/html.c +++ b/src/html.c @@ -265,15 +265,17 @@ decode_entitles (char *s) { char *t = s; /* t - tortoise */ char *h = s; /* h - hare */ + char *e = s; char *end_ptr; - int state = 0, val; + int state = 0, val, base; while (*h) { switch (state) { /* Out of entitle */ case 0: if (*h == '&' && *(h + 1) == '#') { - state = 1; + state = 1; + e = h; h ++; continue; } @@ -285,9 +287,24 @@ decode_entitles (char *s) break; case 1: if (*h == ';') { - val = strtoul ((t + 2), &end_ptr, 10); + /* Determine base */ + if (*(e + 2) == 'x' || *(e + 2) == 'X') { + base = 16; + } + else if (*(e + 2) == 'o' || *(e + 2) == 'O') { + base = 8; + } + else { + base = 10; + } + if (base == 10) { + val = strtoul ((e + 2), &end_ptr, base); + } + else { + val = strtoul ((e + 3), &end_ptr, base); + } if ((end_ptr != NULL && *end_ptr != ';') || !g_ascii_isalnum ((char)val)) { - msg_info ("decode_entitles: invalid entitle code, cannot convert, strtoul returned %d", val); + msg_info ("decode_entitles: invalid entitle code, cannot convert, strtoul returned %d, while reading %s", val, end_ptr); /* Skip undecoded */ t = h; } |