diff options
| author | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2020-02-03 17:19:47 +0000 |
|---|---|---|
| committer | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2020-02-03 17:19:47 +0000 |
| commit | 626107bb0f5593506230940a7d9b53d1b5f06d99 (patch) | |
| tree | 592a45c9e93b664cf45d7269cb212cc31768e639 /src | |
| parent | 3d0dd27030df359f17181c5f926fb500c119a962 (diff) | |
| download | rspamd-626107bb0f5593506230940a7d9b53d1b5f06d99.tar.gz rspamd-626107bb0f5593506230940a7d9b53d1b5f06d99.zip | |
[Minor] Fix a455c6542212948969b6c115344e9d059606407a missing part
Diffstat (limited to 'src')
| -rw-r--r-- | src/libmime/message.h | 2 | ||||
| -rw-r--r-- | src/libmime/mime_encoding.c | 4 | ||||
| -rw-r--r-- | src/lua/lua_mimepart.c | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/src/libmime/message.h b/src/libmime/message.h index c11b273eb..eeba0a053 100644 --- a/src/libmime/message.h +++ b/src/libmime/message.h @@ -114,7 +114,7 @@ struct rspamd_mime_part { #define RSPAMD_MIME_TEXT_PART_FLAG_BALANCED (1 << 1) #define RSPAMD_MIME_TEXT_PART_FLAG_EMPTY (1 << 2) #define RSPAMD_MIME_TEXT_PART_FLAG_HTML (1 << 3) -#define RSPAMD_MIME_TEXT_PART_FLAG_8BIT (1 << 4) +#define RSPAMD_MIME_TEXT_PART_FLAG_8BIT_RAW (1 << 4) #define RSPAMD_MIME_TEXT_PART_FLAG_8BIT_ENCODED (1 << 5) #define RSPAMD_MIME_TEXT_PART_HAS_SUBNORMAL (1 << 6) #define RSPAMD_MIME_TEXT_PART_NORMALISED (1 << 7) diff --git a/src/libmime/mime_encoding.c b/src/libmime/mime_encoding.c index a91447ab6..47295d95b 100644 --- a/src/libmime/mime_encoding.c +++ b/src/libmime/mime_encoding.c @@ -659,6 +659,10 @@ rspamd_mime_text_part_maybe_convert (struct rspamd_task *task, rspamd_ftok_t charset_tok; struct rspamd_mime_part *part = text_part->mime_part; + if (rspamd_str_has_8bit (text_part->raw.begin, text_part->raw.len)) { + text_part->flags |= RSPAMD_MIME_TEXT_PART_FLAG_8BIT_RAW; + } + /* Allocate copy storage */ part_content = g_byte_array_sized_new (text_part->parsed.len); memcpy (part_content->data, text_part->parsed.begin, text_part->parsed.len); diff --git a/src/lua/lua_mimepart.c b/src/lua/lua_mimepart.c index c221cbfa3..7ce6d251d 100644 --- a/src/lua/lua_mimepart.c +++ b/src/lua/lua_mimepart.c @@ -625,7 +625,7 @@ lua_textpart_has_8bit_raw (lua_State * L) struct rspamd_mime_text_part *part = lua_check_textpart (L); if (part) { - if (part->flags & RSPAMD_MIME_TEXT_PART_FLAG_8BIT) { + if (part->flags & RSPAMD_MIME_TEXT_PART_FLAG_8BIT_RAW) { lua_pushboolean (L, TRUE); } else { |