commit 2e14420: [Minor] One more fix for old libicu

Vsevolod Stakhov vsevolod at highsecure.ru
Wed Oct 6 08:00:04 UTC 2021


Author: Vsevolod Stakhov
Date: 2021-10-06 08:56:53 +0100
URL: https://github.com/rspamd/rspamd/commit/2e144202c1b0d229e9228d8dd24b0f6627c31dcf (HEAD -> master)

[Minor] One more fix for old libicu

---
 src/libmime/mime_string.hxx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/libmime/mime_string.hxx b/src/libmime/mime_string.hxx
index 27483ce60..c6041a778 100644
--- a/src/libmime/mime_string.hxx
+++ b/src/libmime/mime_string.hxx
@@ -542,7 +542,7 @@ private:
 	}
 
 	auto append_c_string_filtered(const CharT* str, std::size_t len) -> std::size_t {
-		std::ptrdiff_t i = 0, o = 0;
+		std::int32_t i = 0; // We have to use int32_t here as old libicu is brain-damaged
 		UChar32 uc;
 		char tmp[4];
 		auto orig_size = storage.size();
@@ -568,7 +568,7 @@ private:
 					flags = flags | mime_string_flags::MIME_STRING_SEEN_ZEROES;
 				}
 				else {
-					o = 0;
+					std::int32_t o = 0;
 					U8_APPEND_UNSAFE(tmp, o, uc);
 					storage.append(tmp, o);
 				}


More information about the Commits mailing list