From: Ethan Jackson <ethan@nicira.com>
Date: Thu, 17 Feb 2011 20:52:48 +0000 (-0800)
Subject: ovsdb-server: Fix memory leak.
X-Git-Tag: v1.1.0~269
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=88b649747b690a899f9aae78de6f16690fac1a0c;p=sliver-openvswitch.git

ovsdb-server: Fix memory leak.

Reported-by: Peter Balland <peter@nicira.com>
Bug #4698.
---

diff --git a/ovsdb/ovsdb-server.c b/ovsdb/ovsdb-server.c
index 79fc8f933..fac78c807 100644
--- a/ovsdb/ovsdb-server.c
+++ b/ovsdb/ovsdb-server.c
@@ -171,7 +171,7 @@ main(int argc, char *argv[])
     }
     ovsdb_jsonrpc_server_destroy(jsonrpc);
     ovsdb_destroy(db);
-    shash_destroy(&remotes);
+    shash_destroy_free_data(&remotes);
     unixctl_server_destroy(unixctl);
 
     if (run_process && process_exited(run_process)) {
@@ -593,7 +593,7 @@ reconfigure_from_db(struct ovsdb_jsonrpc_server *jsonrpc,
         }
     }
     ovsdb_jsonrpc_server_set_remotes(jsonrpc, &resolved_remotes);
-    shash_destroy(&resolved_remotes);
+    shash_destroy_free_data(&resolved_remotes);
 
 #if HAVE_OPENSSL
     /* Configure SSL. */