44 lines
1.5 KiB
Diff
44 lines
1.5 KiB
Diff
|
From f66cb2ec1538330c69f94ea4af252868a3aeb8d4 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Yifeng Sun <pkusunyifeng@gmail.com>
|
||
|
|
Date: Wed, 11 Sep 2019 14:18:32 -0700
|
||
|
|
Subject: ovsdb-client: Free ovsdb_schema
|
||
|
|
|
||
|
|
Valgrind reported:
|
||
|
|
|
||
|
|
1925: schema conversion online - standalone
|
||
|
|
|
||
|
|
==10727== 689 (56 direct, 633 indirect) bytes in 1 blocks are definitely lost in loss record 64 of 66
|
||
|
|
==10727== at 0x4C2FB55: calloc (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so)
|
||
|
|
==10727== by 0x449D42: xcalloc (util.c:121)
|
||
|
|
==10727== by 0x40F45C: ovsdb_schema_create (ovsdb.c:41)
|
||
|
|
==10727== by 0x40F7F8: ovsdb_schema_from_json (ovsdb.c:217)
|
||
|
|
==10727== by 0x40FB4E: ovsdb_schema_from_file (ovsdb.c:101)
|
||
|
|
==10727== by 0x40B156: do_convert (ovsdb-client.c:1639)
|
||
|
|
==10727== by 0x4061C6: main (ovsdb-client.c:282)
|
||
|
|
|
||
|
|
This patch fixes it.
|
||
|
|
|
||
|
|
Acked-by: William Tu <u9012063@gmail.com>
|
||
|
|
Signed-off-by: Yifeng Sun <pkusunyifeng@gmail.com>
|
||
|
|
Signed-off-by: Ben Pfaff <blp@ovn.org>
|
||
|
|
---
|
||
|
|
ovsdb/ovsdb-client.c | 1 +
|
||
|
|
1 file changed, 1 insertion(+)
|
||
|
|
|
||
|
|
diff --git a/ovsdb/ovsdb-client.c b/ovsdb/ovsdb-client.c
|
||
|
|
index 9ae15e557..bfc90e6f7 100644
|
||
|
|
--- a/ovsdb/ovsdb-client.c
|
||
|
|
+++ b/ovsdb/ovsdb-client.c
|
||
|
|
@@ -1654,6 +1654,7 @@ do_convert(struct jsonrpc *rpc, const char *database_ OVS_UNUSED,
|
||
|
|
ovsdb_schema_to_json(new_schema)), NULL);
|
||
|
|
check_txn(jsonrpc_transact_block(rpc, request, &reply), &reply);
|
||
|
|
jsonrpc_msg_destroy(reply);
|
||
|
|
+ ovsdb_schema_destroy(new_schema);
|
||
|
|
}
|
||
|
|
|
||
|
|
static void
|
||
|
|
--
|
||
|
|
2.14.1
|
||
|
|
|
||
|
|
|