summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiří Klimeš <blueowl@centrum.cz>2016-11-25 02:50:00 +0100
committerJiří Klimeš <blueowl@centrum.cz>2016-11-25 14:31:47 +0100
commit544f7d36838b46826098e1d2711e299a802380d1 (patch)
tree0f58873ed12f404098d74d7e9ca2543305bf47c3
parent5da352c5e811bb33e85aefccd8ab6be48378f484 (diff)
downloadNetworkManager-544f7d36838b46826098e1d2711e299a802380d1.tar.gz
agent: don't clear "error", g_simple_async_result_take_error() overtakes it
From valgrind: ==21921== Invalid free() / delete / delete[] / realloc() ==21921== at 0x4C2CD5A: free (vg_replace_malloc.c:530) ==21921== by 0x81C4F2D: g_free (gmem.c:189) ==21921== by 0x81AB021: g_error_free (gerror.c:491) ==21921== by 0x81AB325: g_clear_error (gerror.c:674) ==21921== by 0x767B555: reg_request_cb (nm-secret-agent-old.c:616) ==21921== by 0x7A211F2: g_task_return_now (gtask.c:1107) ==21921== by 0x7A21228: complete_in_idle_cb (gtask.c:1121) ==21921== by 0x81BF6B9: g_main_dispatch (gmain.c:3154) ==21921== by 0x81BF6B9: g_main_context_dispatch (gmain.c:3769) ==21921== by 0x81BFA6F: g_main_context_iterate.isra.29 (gmain.c:3840) ==21921== by 0x81BFB1B: g_main_context_iteration (gmain.c:3901) ==21921== by 0x7A4748C: g_application_run (gapplication.c:2381) ==21921== by 0x118AEF: main (main.c:81) It caused memory corruption and may result in strange nm-applet crashes.
-rw-r--r--libnm/nm-secret-agent-old.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/libnm/nm-secret-agent-old.c b/libnm/nm-secret-agent-old.c
index 431516945a..76e4238d26 100644
--- a/libnm/nm-secret-agent-old.c
+++ b/libnm/nm-secret-agent-old.c
@@ -613,7 +613,6 @@ reg_request_cb (GObject *proxy,
if (!nmdbus_agent_manager_call_register_finish (NMDBUS_AGENT_MANAGER (proxy), result, &error))
g_dbus_error_strip_remote_error (error);
reg_result (self, simple, error);
- g_clear_error (&error);
}
static void