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

ovsdb: fix memory leak

Browse source 
@error was leaked when created inside the function.

While at it, remove the goto.

Fixes: 830a5a14cb ('device: add support for OpenVSwitch devices')
(cherry picked from commit 6f6c044739)
This commit is contained in:
Beniamino Galvani 2022-04-28 10:03:56 +02:00 • committed by Thomas Haller
parent fd1d0a79dc
commit e8d6ad9d12
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
1 changed files with 17 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/core/devices/ovs/nm-ovsdb.c
View file

@ -2486,29 +2486,27 @@ typedef struct {
static void
_transact_cb(NMOvsdb *self, json_t *result, GError *error, gpointer user_data)
{
OvsdbCall *call = user_data;
const char *err;
const char *err_details;
size_t index;
json_t *value;
OvsdbCall *call = user_data;
gs_free_error GError *local = NULL;
const char *err;
const char *err_details;
size_t index;
json_t *value;
if (error)
goto out;
json_array_foreach (result, index, value) {
if (json_unpack(value, "{s:s, s:s}", "error", &err, "details", &err_details) == 0) {
g_set_error(&error,
G_IO_ERROR,
G_IO_ERROR_FAILED,
"Error running the transaction: %s: %s",
err,
err_details);
goto out;
if (!error) {
json_array_foreach (result, index, value) {
if (json_unpack(value, "{s:s, s:s}", "error", &err, "details", &err_details) == 0) {
local = g_error_new(G_IO_ERROR,
G_IO_ERROR_FAILED,
"Error running the transaction: %s: %s",
err,
err_details);
break;
}
}
}
out:
call->callback(error, call->user_data);
call->callback(local ?: error, call->user_data);
nm_g_slice_free(call);
}