From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Tue, 14 Jul 2015 09:10:34 +0000 (+0100)
Subject: Fix some more issues found after mime rework.
X-Git-Tag: 1.0.0~377
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3c99c2f5af0bb590b40a8551bcaf7be467af15f4;p=thirdparty%2Frspamd.git

Fix some more issues found after mime rework.
---

diff --git a/src/libmime/mime_expressions.c b/src/libmime/mime_expressions.c
index 5926673462..112c7a37f0 100644
--- a/src/libmime/mime_expressions.c
+++ b/src/libmime/mime_expressions.c
@@ -1918,8 +1918,8 @@ rspamd_content_type_compare_param (struct rspamd_task * task,
 	param_name = arg->data;
 	arg_pattern = &g_array_index (args, struct expression_argument, 1);
 
-	for (i = 0; i < task->text_parts->len; i ++) {
-		cur_part = g_ptr_array_index (task->text_parts, i);
+	for (i = 0; i < task->parts->len; i ++) {
+		cur_part = g_ptr_array_index (task->parts, i);
 		part = cur_part->mime;
 		ct = (GMimeContentType *)g_mime_object_get_content_type (part);
 
@@ -1999,8 +1999,8 @@ rspamd_content_type_has_param (struct rspamd_task * task,
 	g_assert (arg->type == EXPRESSION_ARGUMENT_NORMAL);
 	param_name = arg->data;
 
-	for (i = 0; i < task->text_parts->len; i ++) {
-		cur_part = g_ptr_array_index (task->text_parts, i);
+	for (i = 0; i < task->parts->len; i ++) {
+		cur_part = g_ptr_array_index (task->parts, i);
 		part = cur_part->mime;
 		ct = (GMimeContentType *)g_mime_object_get_content_type (part);
 
@@ -2060,8 +2060,8 @@ rspamd_content_type_check (struct rspamd_task *task,
 
 	arg_pattern = &g_array_index (args, struct expression_argument, 0);
 
-	for (i = 0; i < task->text_parts->len; i ++) {
-		cur_part = g_ptr_array_index (task->text_parts, i);
+	for (i = 0; i < task->parts->len; i ++) {
+		cur_part = g_ptr_array_index (task->parts, i);
 		part = cur_part->mime;
 		ct = (GMimeContentType *)g_mime_object_get_content_type (part);
 
@@ -2198,8 +2198,8 @@ common_has_content_part (struct rspamd_task * task,
 	gint r;
 	guint i;
 
-	for (i = 0; i < task->text_parts->len; i ++) {
-		part = g_ptr_array_index (task->text_parts, i);
+	for (i = 0; i < task->parts->len; i ++) {
+		part = g_ptr_array_index (task->parts, i);
 		ct = part->type;
 
 		if (ct == NULL) {