From: Aki Tuomi <aki.tuomi@open-xchange.com>
Date: Thu, 13 Aug 2020 06:48:27 +0000 (+0300)
Subject: lib-ntlm: Use CONST_PTR_OFFSET
X-Git-Tag: 2.3.13~206
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=371025a2877eeea125e70bdf127874ad1ddca63b;p=thirdparty%2Fdovecot%2Fcore.git

lib-ntlm: Use CONST_PTR_OFFSET
---

diff --git a/src/lib-ntlm/ntlm-message.c b/src/lib-ntlm/ntlm-message.c
index 52b006f6bb..65dcfdfdbf 100644
--- a/src/lib-ntlm/ntlm-message.c
+++ b/src/lib-ntlm/ntlm-message.c
@@ -22,7 +22,7 @@ const char *ntlmssp_t_str_i(const void *message, struct ntlmssp_buffer *buffer,
 			    bool unicode)
 {
 	unsigned int len = le16_to_cpu(buffer->length);
-	const char *p = ((const char *) message) + le32_to_cpu(buffer->offset);
+	const char *p = CONST_PTR_OFFSET(message, le32_to_cpu(buffer->offset));
 	string_t *str;
 
 	if (unicode)
diff --git a/src/lib-ntlm/ntlm.h b/src/lib-ntlm/ntlm.h
index 174cbe7ac8..2220bc05c6 100644
--- a/src/lib-ntlm/ntlm.h
+++ b/src/lib-ntlm/ntlm.h
@@ -15,7 +15,7 @@
 static inline const void *
 ntlmssp_buffer_data_i(void *message, struct ntlmssp_buffer *buffer)
 {
-	return ((char *) message) + le32_to_cpu(buffer->offset);
+	return CONST_PTR_OFFSET(message, le32_to_cpu(buffer->offset));
 }
 
 #define ntlmssp_buffer_length(message, buffer) \