upstream/haproxy
1
0
Fork 0
mirror of https://github.com/haproxy/haproxy.git synced 2026-05-28 04:12:17 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 12

BUG/MINOR: resolvers: fix room for trailing zero in resolv_dn_label_to_str()

Browse source 
The previous fix 75f72c2eb ("BUG/MEDIUM: resolvers: Fix test on dn label
size in resolv_dn_label_to_str()") can still be fooled by an input exactly
the size of str_len, in which case the trailing zero appended at the end
was not being accounted for. Let's add 1 to the condition to prepare for
it.

This needs to be backported wherever the fix above is backported.
This commit is contained in:
Willy Tarreau 2026-05-23 18:53:27 +02:00
parent 340cc86efb
commit 01ebb668a4
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/resolvers.c
View file

@ -1857,8 +1857,8 @@ int resolv_dn_label_to_str(const char *dn, int dn_len, char *str, int str_len)
for (i = 0; i < dn_len; ++i) {
sz = (unsigned char)dn[i];
/* Check str_len adding 1 for the dot if (i!=0) */
if (str_len < sz+i+(!!i))
/* Check str_len adding 1 for the dot if (i!=0) and 1 for null terminator */
if (str_len < sz+i+(!!i)+1)
return -1;
if (i)