fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-02-05 03:00:29 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

shared: fix nm_utils_bin2hexstr_full() for buffers of length zero

Browse source
This commit is contained in:
Thomas Haller 2019-06-19 15:17:05 +02:00
parent 4dce38c37f
commit 637c785f4e
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
shared/nm-glib-aux/nm-shared-utils.c
View file

@ -2906,10 +2906,13 @@ nm_utils_memeqzero (gconstpointer data, gsize length)
* be returned and must be freed by the caller.
* If not %NULL, the buffer must already be preallocated and contain
* at least (@length*2+1) or (@length*3) bytes, depending on the delimiter.
* If @length is zero, then of course at least one byte will be allocated
* or @out (if given) must contain at least room for the trailing NUL byte.
*
* Returns: the binary value converted to a hex string. If @out is given,
* this always returns @out. If @out is %NULL, a newly allocated string
* is returned.
* is returned. This never returns %NULL, for buffers of length zero
* an empty string is returend.
*/
char *
nm_utils_bin2hexstr_full (gconstpointer addr,
@ -2925,9 +2928,11 @@ nm_utils_bin2hexstr_full (gconstpointer addr,
if (out)
out0 = out;
else {
out0 = out = g_new (char, delimiter == '\0'
? length * 2 + 1
: length * 3);
out0 = out = g_new (char, length == 0
? 1u
: ( delimiter == '\0'
? length * 2u + 1u
: length * 3u));
}
/* @out must contain at least @length*3 bytes if @delimiter is set,