From: Russell Bryant <rbryant@redhat.com>
Date: Fri, 1 May 2015 18:22:02 +0000 (-0400)
Subject: ovn-controller: Free some more memory before exit.
X-Git-Tag: v2.5.0~1087
X-Git-Url: http://git.cascardo.info/?a=commitdiff_plain;h=07c747d036eefc54aff602dd638485adbb2099cd;p=cascardo%2Fovs.git

ovn-controller: Free some more memory before exit.

Free a few pointers to malloc'd memory before exit.

Signed-off-by: Russell Bryant <rbryant@redhat.com>
Acked-by: Kyle Mestery <mestery@mestery.com>
Signed-off-by: Justin Pettit <jpettit@nicira.com>
---

diff --git a/ovn/controller/ovn-controller.c b/ovn/controller/ovn-controller.c
index 778dd4337..9d61a48a2 100644
--- a/ovn/controller/ovn-controller.c
+++ b/ovn/controller/ovn-controller.c
@@ -242,6 +242,9 @@ main(int argc, char *argv[])
     ovsdb_idl_destroy(ctx.ovnsb_idl);
 
     free(ctx.br_int_name);
+    free(ctx.chassis_id);
+    free(ovnsb_remote);
+    free(ovs_remote);
 
     exit(retval);
 }
@@ -305,7 +308,7 @@ parse_options(int argc, char *argv[])
     if (argc == 0) {
         ovs_remote = xasprintf("unix:%s/db.sock", ovs_rundir());
     } else if (argc == 1) {
-        ovs_remote = argv[0];
+        ovs_remote = xstrdup(argv[0]);
     } else {
         VLOG_FATAL("exactly zero or one non-option argument required; "
                    "use --help for usage");