]> source.dussan.org Git - rspamd.git/commitdiff
[Fix] Fix boundaries checks in embedded messages
authorVsevolod Stakhov <vsevolod@highsecure.ru>
Fri, 30 Nov 2018 15:17:11 +0000 (15:17 +0000)
committerVsevolod Stakhov <vsevolod@highsecure.ru>
Fri, 30 Nov 2018 15:17:11 +0000 (15:17 +0000)
src/libmime/mime_parser.c

index 2f999de89c10990cab3d31a4677757ec4f8f701e..5cfda74bf1c5ab5f31d4686c8f20b6edcb3f6dfb 100644 (file)
@@ -1294,7 +1294,7 @@ rspamd_mime_parse_message (struct rspamd_task *task,
                        start_boundary = NULL;
 
                        for (i = sel_idx; i < nst->boundaries->len; i++) {
-                               boundary = &g_array_index (st->boundaries,
+                               boundary = &g_array_index (nst->boundaries,
                                                struct rspamd_mime_boundary, i);
 
                                if (boundary->start > cur_offset &&
@@ -1310,17 +1310,17 @@ rspamd_mime_parse_message (struct rspamd_task *task,
                                const gchar *start, *end;
 
                                if (nst->boundaries->len > sel_idx + 1) {
-                                       end_boundary = &g_array_index (st->boundaries,
+                                       end_boundary = &g_array_index (nst->boundaries,
                                                        struct rspamd_mime_boundary, sel_idx + 1);
-                                       end = st->start + end_boundary->boundary;
+                                       end = nst->start + end_boundary->boundary;
                                }
                                else {
-                                       end = st->end;
+                                       end = nst->end;
                                }
 
                                sel_idx ++;
 
-                               start = st->start + start_boundary->start;
+                               start = nst->start + start_boundary->start;
 
                                if (end > start &&
                                        (ret = rspamd_mime_process_multipart_node (task, st,