upstream/unbound
1
0
Fork 0
mirror of https://github.com/NLnetLabs/unbound.git synced 2025-12-26 17:49:55 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'Shchelk-bufferoverflow'

Browse source
This commit is contained in:
George Thessalonikefs 2022-02-02 10:50:54 +01:00
commit 25eae982de
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
doc/Changelog
View file

@ -1,3 +1,6 @@
2 February 2022: George
- Merge PR #532 from Shchelk: Fix: buffer overflow bug.
1 February 2022: George
- Merge PR #603 from fobser: Use OpenSSL 1.1 API to access DSA and RSA
internals.

5
sldns/str2wire.c
View file

@ -604,7 +604,10 @@ sldns_affix_token(sldns_buffer* strbuf, char* token, size_t* token_len,
size_t addstrlen = 0;
/* add space */
if(addlen < 1) return 0;
/* when addlen < 2, the token buffer is full considering the NULL byte
* from strlen and will lead to buffer overflow with the second
* assignement below. */
if(addlen < 2) return 0;
token[*token_strlen] = ' ';
token[++(*token_strlen)] = 0;