Skip to contentSkip to conversation

unit: correct memcpy overrun in test-dpp

PATCH Applied James Prestwood 2 participants 2 messages Oct 25, 2023 – Oct 26, 2023

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 unit: correct memcpy overrun in test-dpp

The memcpy in HEX2BUF was copying the length of the buffer that was passed in, not the actual length of the converted hexstring. This test was segfaulting in the Alpine CI which uses clang/musl.

---
 unit/test-dpp.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
unit/test-dpp.c +3 -2
index c782efba..c3f3731f 100644
@@ -183,8 +183,9 @@ const char *r_asn1 = "3039301306072a8648ce3d020106082a8648ce3d0301070322000209c5
 			"4df9fd25a045201885c39cc5cfae397ddaeda957dec57fa0e3503f";
 
 #define HEX2BUF(s, buf, _len) { \
-	unsigned char *_tmp = l_util_from_hexstring(s, NULL); \
-	memcpy(buf, _tmp, _len); \
+	size_t _len_out; \
+	unsigned char *_tmp = l_util_from_hexstring(s, &_len_out); \
+	memcpy(buf, _tmp, _len_out); \
 	l_free(_tmp); \
 }
 
Signature · 1 line
2.25.1
#1 lore raw

Hi James,

Quoted 7 lines · James Prestwood

The memcpy in HEX2BUF was copying the length of the buffer that was passed in, not the actual length of the converted hexstring. This test was segfaulting in the Alpine CI which uses clang/musl.

---
  unit/test-dpp.c | 5 +++--
  1 file changed, 3 insertions(+), 2 deletions(-)

Applied, thanks.

Regards,
-Denis