diff options
| author | Jiří Klimeš <jklimes@redhat.com> | 2015-10-30 13:44:15 +0100 |
|---|---|---|
| committer | Jiří Klimeš <jklimes@redhat.com> | 2015-10-30 14:00:15 +0100 |
| commit | 6cd5cc595fb33cb51ddc99be478f103d2073c194 (patch) | |
| tree | 107a50d0d9a59eb36f4822c49de0c9c1ac466f3e /callouts | |
| parent | b42098f4d0221d0c8411c0ebce7dfed1c894078a (diff) | |
| download | NetworkManager-6cd5cc595fb33cb51ddc99be478f103d2073c194.tar.gz | |
dispatcher: fix abort in case of an error (rh #1275813)
request_free() can be called on an error.
Oct 27 20:27:46 localhost.localdomain nm-dispatcher[2328]: #1 'pre-up': completed: invalid request: Missing or invalid required value path!
Oct 27 20:27:46 localhost.localdomain nm-dispatcher[2328]: **
Oct 27 20:27:46 localhost.localdomain nm-dispatcher[2328]: ERROR:nm-dispatcher.c:203:request_free: assertion failed (request->num_scripts_done == request->scripts->len): (0 == 1)
Fixes: 1999723241c49a7f2d5052d34299aad3d6e26e41
https://bugzilla.redhat.com/show_bug.cgi?id=1275813
Diffstat (limited to 'callouts')
| -rw-r--r-- | callouts/nm-dispatcher.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/callouts/nm-dispatcher.c b/callouts/nm-dispatcher.c index 48399e62f6..ee972faadf 100644 --- a/callouts/nm-dispatcher.c +++ b/callouts/nm-dispatcher.c @@ -720,6 +720,7 @@ handle_action (NMDBusDispatcher *dbus_dispatcher, results = g_variant_new_array (G_VARIANT_TYPE ("(sus)"), NULL, 0); g_dbus_method_invocation_return_value (context, g_variant_new ("(@a(sus))", results)); + request->num_scripts_done = request->scripts->len; request_free (request); return TRUE; } |