From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Fri, 17 Jul 2020 19:23:55 +0000 (-0400)
Subject: dbuff: Allow dbuffs to wrap string buffers
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=308b0f9ffca5b698c4493b309a503ca976c10dad;p=thirdparty%2Ffreeradius-server.git

dbuff: Allow dbuffs to wrap string buffers
---

diff --git a/src/lib/util/dbuff.h b/src/lib/util/dbuff.h
index 28834a389e4..396cea20917 100644
--- a/src/lib/util/dbuff.h
+++ b/src/lib/util/dbuff.h
@@ -189,15 +189,19 @@ static inline void _fr_dbuff_init(fr_dbuff_t *out, uint8_t const *start, uint8_t
  */
 #define fr_dbuff_init(_out, _start, _len_or_end) \
 _fr_dbuff_init(_out, \
-	       _start, \
+	       (uint8_t const *)(_start), \
 	       _Generic((_len_or_end), \
 			size_t		: (uint8_t const *)(_start) + (size_t)(_len_or_end), \
 			uint8_t *	: (uint8_t const *)(_len_or_end), \
-			uint8_t const *	: (uint8_t const *)(_len_or_end) \
+			uint8_t const *	: (uint8_t const *)(_len_or_end), \
+			char *		: (uint8_t const *)(_len_or_end), \
+			char const *	: (uint8_t const *)(_len_or_end) \
 	       ), \
 	       _Generic((_start), \
 			uint8_t *	: false, \
-			uint8_t const *	: true \
+			uint8_t const *	: true, \
+			char *		: false, \
+			char const *	: true \
 	       ))
 
 /** Creates a compound literal to pass into functions which accept a dbuff
@@ -212,16 +216,20 @@ _fr_dbuff_init(_out, \
  */
 #define FR_DBUFF_TMP(_start, _len_or_end) \
 (fr_dbuff_t){ \
-	.start_i	= _start, \
+	.start_i	= (uint8_t const *)(_start), \
 	.end_i		= _Generic((_len_or_end), \
 				size_t		: (uint8_t const *)(_start) + (size_t)(_len_or_end), \
 				uint8_t *	: (uint8_t const *)(_len_or_end), \
-				uint8_t const *	: (uint8_t const *)(_len_or_end) \
+				uint8_t const *	: (uint8_t const *)(_len_or_end), \
+				char *		: (uint8_t const *)(_len_or_end), \
+				char const *	: (uint8_t const *)(_len_or_end) \
 			), \
 	.p_i		= _start, \
 	.is_const	= _Generic((_start), \
 				uint8_t *	: false, \
-				uint8_t const *	: true \
+				uint8_t const *	: true, \
+				char *		: false, \
+				char const *	: true \
 	       		) \
 }
 /** @} */