summaryrefslogtreecommitdiff
path: root/ovsdb
diff options
context:
space:
mode:
authorAndy Zhou <azhou@ovn.org>2016-07-28 15:57:40 -0700
committerAndy Zhou <azhou@ovn.org>2016-08-14 23:25:36 -0700
commit8fd2bca0270f4055bccca103c596949ab7591b4d (patch)
treed4cfbab92b2e8eca6dcc2fa9745d1bcb212c7566 /ovsdb
parent8c945cece4d4fc86e808e3b263c484be05f0e2f1 (diff)
downloadopenvswitch-8fd2bca0270f4055bccca103c596949ab7591b4d.tar.gz
ovsdb: Fix bug, set rpc to NULL after freeing.
Found by inspection. Tested-by: Daniel Levy <dlevy@us.ibm.com> Reported-at: http://openvswitch.org/pipermail/discuss/2016-August/022322.html Signed-off-by: Andy Zhou <azhou@ovn.org> Acked-by: Ben Pfaff <blp@ovn.org>
Diffstat (limited to 'ovsdb')
-rw-r--r--ovsdb/replication.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/ovsdb/replication.c b/ovsdb/replication.c
index 19626a5dc..de6eec1ec 100644
--- a/ovsdb/replication.c
+++ b/ovsdb/replication.c
@@ -150,6 +150,7 @@ void
disconnect_active_server(void)
{
jsonrpc_close(rpc);
+ rpc = NULL;
sset_clear(&monitored_tables);
sset_clear(&tables_blacklist);
}
@@ -157,7 +158,7 @@ disconnect_active_server(void)
void
destroy_active_server(void)
{
- jsonrpc_close(rpc);
+ disconnect_active_server();
sset_destroy(&monitored_tables);
sset_destroy(&tables_blacklist);