From: Vsevolod Stakhov <vsevolod@rambler-co.ru>
Date: Mon, 5 Jul 2010 14:25:05 +0000 (+0400)
Subject: * Fix chartable module in utf mode
X-Git-Tag: 0.3.1~63
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9f7f743f9e4c5ee9755d8c4cd757b151daa15954;p=thirdparty%2Frspamd.git

* Fix chartable module in utf mode
---

diff --git a/src/message.c b/src/message.c
index ef3cc02e69..834f36f450 100644
--- a/src/message.c
+++ b/src/message.c
@@ -548,7 +548,7 @@ process_text_part (struct worker_task *task, GByteArray * part_content, GMimeCon
 		text_part->html_urls = g_tree_new ((GCompareFunc) g_ascii_strcasecmp);
 		text_part->urls = g_tree_new ((GCompareFunc) g_ascii_strcasecmp);
 
-		text_part->content = strip_html_tags (task, task->task_pool, text_part, part_content, NULL);
+		text_part->content = strip_html_tags (task, task->task_pool, text_part, text_part->orig, NULL);
 
 		if (text_part->html_nodes == NULL) {
 			url_parse_text (task->task_pool, task, text_part, FALSE);
diff --git a/src/plugins/chartable.c b/src/plugins/chartable.c
index e5b5893fb5..785cd3a598 100644
--- a/src/plugins/chartable.c
+++ b/src/plugins/chartable.c
@@ -135,7 +135,7 @@ check_part (struct mime_text_part *part, gboolean raw_mode)
 	else {
 		while (remain > 0) {
 			c = g_utf8_get_char_validated (p, remain);
-			if (c == (gunichar) - 2 || c == (gunichar) - 1) {
+			if (c == (gunichar) -2 || c == (gunichar) -1) {
 				/* Invalid characters detected, stop processing */
 				return FALSE;
 			}
@@ -147,12 +147,12 @@ check_part (struct mime_text_part *part, gboolean raw_mode)
 
 			if (remain > 0) {
 				t = g_utf8_get_char_validated (p, remain);
-				if (c == (gunichar) - 2 || c == (gunichar) - 1) {
+				if (t == (gunichar) -2 || t == (gunichar) -1) {
 					/* Invalid characters detected, stop processing */
 					return FALSE;
 				}
 				sct = g_unichar_get_script (t);
-				if (g_unichar_isalnum (c) && g_unichar_isalnum (t)) {
+				if (g_unichar_isalpha (c) && g_unichar_isalpha (t)) {
 					/* We have two unicode alphanumeric characters, so we can check its script */
 					if (sct != scc) {
 						mark++;