[OpenWrt-Devel] [PATCH uci 13/18] lua: fix memory leak in changes method

[Petr Štetiar]

Configs returned by uci_list_configs call are not freed when not needed,
leading to the memory leak. While at it make the code cleaner.

Signed-off-by: Petr Štetiar <ynezz at true.cz>
---
 lua/uci.c                                         | 15 ++++++++-------
 tests/cram/lua/test_cases/changes_doesnt_leak.lua | 11 +++++++++++
 tests/cram/test_ucilua_testcases.t                | 10 ++++++++++
 3 files changed, 29 insertions(+), 7 deletions(-)
 create mode 100644 tests/cram/lua/test_cases/changes_doesnt_leak.lua
 create mode 100644 tests/cram/test_ucilua_testcases.t

diff --git a/lua/uci.c b/lua/uci.c
index 323f81a68c17..42fe4b785901 100644
--- a/lua/uci.c
+++ b/lua/uci.c
@@ -880,16 +880,17 @@ uci_lua_changes(lua_State *L)
 	lua_newtable(L);
 	if (package) {
 		uci_lua_changes_pkg(L, ctx, package);
-	} else {
-		if (uci_list_configs(ctx, &config) != 0)
-			goto done;
+		return 1;
+	}
 
-		for(i = 0; config[i] != NULL; i++) {
-			uci_lua_changes_pkg(L, ctx, config[i]);
-		}
+	if ((uci_list_configs(ctx, &config) != UCI_OK) || !config)
+		return 1;
+
+	for (i = 0; config[i] != NULL; i++) {
+		uci_lua_changes_pkg(L, ctx, config[i]);
 	}
 
-done:
+	free(config);
 	return 1;
 }
 
diff --git a/tests/cram/lua/test_cases/changes_doesnt_leak.lua b/tests/cram/lua/test_cases/changes_doesnt_leak.lua
new file mode 100644
index 000000000000..68f0ed05bc2a
--- /dev/null
+++ b/tests/cram/lua/test_cases/changes_doesnt_leak.lua
@@ -0,0 +1,11 @@
+local A = assert
+local c = uci.cursor(os.getenv("CONFIG_DIR"))
+
+A(c:set("network", "lan", "dns", {
+	"ns1.king.banik.cz",
+	"ns2.openwrt.org",
+}))
+
+local changes = c:changes()
+A(changes.network.lan.dns[1] == "ns1.king.banik.cz")
+A(changes.network.lan.dns[2] == "ns2.openwrt.org")
diff --git a/tests/cram/test_ucilua_testcases.t b/tests/cram/test_ucilua_testcases.t
new file mode 100644
index 000000000000..279dfce9422a
--- /dev/null
+++ b/tests/cram/test_ucilua_testcases.t
@@ -0,0 +1,10 @@
+set LUA_CPATH and ucilua for convenience:
+
+  $ [ -n "$UCI_LUA" ] && export LUA_CPATH="$(dirname "$UCI_LUA")/?.so"
+  $ alias ucilua="valgrind --quiet --leak-check=full lua -luci"
+
+check that changes method doesnt leak memory:
+
+  $ cp -R "$TESTDIR/config" .
+  $ export CONFIG_DIR=$(pwd)/config
+  $ ucilua $TESTDIR/lua/test_cases/changes_doesnt_leak.lua

_______________________________________________
openwrt-devel mailing list
openwrt-devel at lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel