fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-29 16:10:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

cli: use "free()" for string from readline

Browse source 
Since glib 2.45, we are guaranteed that g_free() just calls free(), so
both can be used interchangeably. However, we still only depend on glib
2.40.

In any case, it's ugly to mix the two. Memory allocated by plain
malloc(), should be only freed with free(). The buffer in question comes
from readline, which allocates it using the system allocator.

Fixes: 995229181c ('cli: remove editor thread')
(cherry picked from commit 5dc07174d3)
(cherry picked from commit 633c734255)
This commit is contained in:
Thomas Haller 2023-02-03 15:43:03 +01:00
parent e2c83c61f0
commit 5199bd51e2
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
1 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/nmcli/common.c
View file

@ -926,7 +926,6 @@ read_again:
if (nmc_config->in_editor || (rl_string && *rl_string)) {
/* In editor, or the line is not empty */
/* Call readline again to get new prompt (repeat) */
g_free(rl_string);
goto read_again;
} else {
/* Not in editor and line is empty, exit */
@ -939,10 +938,8 @@ read_again:
}
/* Return NULL, not empty string */
if (rl_string && *rl_string == '\0') {
g_free(rl_string);
rl_string = NULL;
}
if (rl_string && *rl_string == '\0')
nm_clear_free(&rl_string);
nm_clear_g_source_inst(&io_source);