From: jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Mon, 14 Nov 2011 13:32:39 +0000 (+0000)
Subject: [backfire] uci: fix segmentation fault in lua api when deleting sections within a... 
X-Git-Url: http://git.ozo.com/?p=openwrt-10.03%2F.git;a=commitdiff_plain;h=789765add770a1a8011e1a3ddcad3c40aab6335d;ds=sidebyside

[backfire] uci: fix segmentation fault in lua api when deleting sections within a foreach callback (backport of 7115636d1cfa690480ab2d92a75f30656bb8aa9a)


git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@29112 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/package/uci/patches/130-lua_fix_nested_foreach_delete.patch b/package/uci/patches/130-lua_fix_nested_foreach_delete.patch
new file mode 100644
index 000000000..70c23ad7b
--- /dev/null
+++ b/package/uci/patches/130-lua_fix_nested_foreach_delete.patch
@@ -0,0 +1,20 @@
+--- a/lua/uci.c
++++ b/lua/uci.c
+@@ -266,7 +266,7 @@ uci_lua_foreach(lua_State *L)
+ {
+ 	struct uci_context *ctx;
+ 	struct uci_package *p;
+-	struct uci_element *e;
++	struct uci_element *e, *tmp;
+ 	const char *package, *type;
+ 	bool ret = false;
+ 	int offset = 0;
+@@ -287,7 +287,7 @@ uci_lua_foreach(lua_State *L)
+ 	if (!p)
+ 		goto done;
+ 
+-	uci_foreach_element(&p->sections, e) {
++	uci_foreach_element_safe(&p->sections, tmp, e) {
+ 		struct uci_section *s = uci_to_section(e);
+ 
+ 		i++;