[Minor] Use safe version of utf8 macro

diff --git a/src/plugins/chartable.c b/src/plugins/chartable.c
index 5ff7fc380a2887754aff9836b53b58db1509bb6f..aed8ee8047e2c7a36cfe109b3ee65ad929fc8745 100644 (file)
--- a/src/plugins/chartable.c
+++ b/src/plugins/chartable.c
@@ -191,7 +191,11 @@ rspamd_chartable_process_word_utf (struct rspamd_task *task,
        /* We assume that w is normalized */
 
        while (p + i < end) {
-               U8_NEXT_UNSAFE (p, i, uc);
+               U8_NEXT (p, i, w->len, uc);
+
+               if (((gint32)uc) < 0) {
+                       break;
+               }
 
                if (u_isalpha (uc)) {
                        sc = ublock_getCode (uc);