summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Pfaff <blp@nicira.com>2013-01-24 11:33:35 -0800
committerBen Pfaff <blp@nicira.com>2013-03-12 09:17:16 -0700
commit40de3647ffe58ef47cafcd7dce8d6c4a4600fd86 (patch)
tree62c7769312e394c92c9554f691004f03e04f18d7
parentf031a02cc5a4c4362d32c5eea1cd6f3b4a7eb923 (diff)
downloadopenvswitch-branch-1.5.tar.gz
ovsdb: Fix memory leak.branch-1.5
Signed-off-by: Ben Pfaff <blp@nicira.com> Acked-by: Ethan Jackson <ethan@nicira.com>
-rw-r--r--ovsdb/jsonrpc-server.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/ovsdb/jsonrpc-server.c b/ovsdb/jsonrpc-server.c
index a4be698e5..1aa2d1108 100644
--- a/ovsdb/jsonrpc-server.c
+++ b/ovsdb/jsonrpc-server.c
@@ -342,6 +342,11 @@ ovsdb_jsonrpc_session_close(struct ovsdb_jsonrpc_session *s)
{
ovsdb_jsonrpc_monitor_remove_all(s);
ovsdb_jsonrpc_session_unlock_all(s);
+ ovsdb_jsonrpc_trigger_complete_all(s);
+
+ hmap_destroy(&s->monitors);
+ hmap_destroy(&s->triggers);
+
jsonrpc_session_close(s->js);
list_remove(&s->node);
s->remote->server->n_sessions--;