diff options
| author | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2016-07-17 20:44:37 +0100 |
|---|---|---|
| committer | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2016-07-17 20:44:37 +0100 |
| commit | 1386abcfc2fcbb217b7ba9bc69f8a5c522231855 (patch) | |
| tree | d8767b184a255ac69032a60f40229ab2df93d4e4 /src | |
| parent | 96301622dd4b7af470c93faa0fef8bf7df89ff7a (diff) | |
| download | rspamd-1386abcfc2fcbb217b7ba9bc69f8a5c522231855.tar.gz rspamd-1386abcfc2fcbb217b7ba9bc69f8a5c522231855.zip | |
[Fix] Fix chartable issue with starting digits
Issue: #725
Reported by: @moisseev
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/chartable.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/src/plugins/chartable.c b/src/plugins/chartable.c index 83c897366..2d2bbdcc5 100644 --- a/src/plugins/chartable.c +++ b/src/plugins/chartable.c @@ -174,7 +174,7 @@ rspamd_chartable_process_word_utf (struct rspamd_task *task, rspamd_ftok_t *w, got_alpha, got_digit, got_unknown, - } state = start_process; + } state = start_process, prev_state = start_process; p = w->begin; end = p + w->len; @@ -192,7 +192,7 @@ rspamd_chartable_process_word_utf (struct rspamd_task *task, rspamd_ftok_t *w, if (state == got_digit) { /* Penalize digit -> alpha translations */ if (!is_url && sc != G_UNICODE_SCRIPT_COMMON && - sc != G_UNICODE_SCRIPT_LATIN) { + sc != G_UNICODE_SCRIPT_LATIN && prev_state != start_process) { badness += 1.0; } } @@ -214,15 +214,24 @@ rspamd_chartable_process_word_utf (struct rspamd_task *task, rspamd_ftok_t *w, } } + prev_state = state; state = got_alpha; } else if (g_unichar_isdigit (uc)) { + if (state != got_digit) { + prev_state = state; + } + state = got_digit; same_script_count = 0; } else { /* We don't care about unknown characters here */ + if (state != got_unknown) { + prev_state = state; + } + state = got_unknown; same_script_count = 0; } |