diff mbox

[ovs-dev,v2,1/3] ovsdb-client: fix memory leak reported by valgrind

Message ID 1451953121-23921-1-git-send-email-u9012063@gmail.com
State Accepted
Headers show

Commit Message

William Tu Jan. 5, 2016, 12:18 a.m. UTC 
Free memory allocated from table_add_column and table_add_row.
Test case: vsctl-bashcomp - basic verification/argument completion(7,8)
Call stack is below:
    xrealloc (util.c:123)
    table_add_column (table.c:146) or table_add_row (table.c:172)
    do_list_tables (ovsdb-client.c:449)
    main (ovsdb-client.c:151)

Signed-off-by: William Tu <u9012063@gmail.com>
Signed-off-by: Daniele Di Proietto <diproiettod@vmware.com>
Co-authored-by: Daniele Di Proietto <diproiettod@vmware.com>
---
 ovsdb/ovsdb-client.c | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

Comments

Ben Pfaff Jan. 5, 2016, 12:52 a.m. UTC | #1 
On Mon, Jan 04, 2016 at 04:18:39PM -0800, William Tu wrote:
> Free memory allocated from table_add_column and table_add_row.
> Test case: vsctl-bashcomp - basic verification/argument completion(7,8)
> Call stack is below:
>     xrealloc (util.c:123)
>     table_add_column (table.c:146) or table_add_row (table.c:172)
>     do_list_tables (ovsdb-client.c:449)
>     main (ovsdb-client.c:151)
> 
> Signed-off-by: William Tu <u9012063@gmail.com>
> Signed-off-by: Daniele Di Proietto <diproiettod@vmware.com>
> Co-authored-by: Daniele Di Proietto <diproiettod@vmware.com>

"if (x) { free(x); }" can always be written as just "free(x);"
I changed that in one place and will apply this to master in a minute.
diff mbox

Patch

diff --git a/ovsdb/ovsdb-client.c b/ovsdb/ovsdb-client.c
index 83cc81d..30a9c40 100644
--- a/ovsdb/ovsdb-client.c
+++ b/ovsdb/ovsdb-client.c
@@ -84,7 +84,7 @@  int
 main(int argc, char *argv[])
 {
     const struct ovsdb_client_command *command;
-    const char *database;
+    char *database;
     struct jsonrpc *rpc;
 
     ovs_cmdl_proctitle_init(argc, argv);
@@ -128,12 +128,13 @@  main(int argc, char *argv[])
         fetch_dbs(rpc, &dbs);
         if (argc - optind > command->min_args
             && svec_contains(&dbs, argv[optind])) {
-            database = argv[optind++];
+            database = xstrdup(argv[optind++]);
         } else if (dbs.n == 1) {
             database = xstrdup(dbs.names[0]);
         } else if (svec_contains(&dbs, "Open_vSwitch")) {
-            database = "Open_vSwitch";
+            database = xstrdup("Open_vSwitch");
         } else {
+            jsonrpc_close(rpc);
             ovs_fatal(0, "no default database for `%s' command, please "
                       "specify a database name", command->name);
         }
@@ -150,6 +151,10 @@  main(int argc, char *argv[])
 
     command->handler(rpc, database, argc - optind, argv + optind);
 
+    if (database) {
+        free(database);
+    }
+
     jsonrpc_close(rpc);
 
     if (ferror(stdout)) {
@@ -455,6 +460,7 @@  do_list_tables(struct jsonrpc *rpc, const char *database,
     }
     ovsdb_schema_destroy(schema);
     table_print(&t, &table_style);
+    table_destroy(&t);
 }
 
 static void
@@ -493,6 +499,7 @@  do_list_columns(struct jsonrpc *rpc, const char *database,
     }
     ovsdb_schema_destroy(schema);
     table_print(&t, &table_style);
+    table_destroy(&t);
 }
 
 static void