From: Jo-Philipp Wich <jow@openwrt.org>
Date: Wed, 30 Nov 2011 12:50:32 +0000 (+0000)
Subject: libs/web: add assert() statements for unresolvable function case
X-Git-Tag: 0.11.0~1288
X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fluci.git;a=commitdiff_plain;h=099e97532cca6925282e79ebe267cc3b25e7aa4f

libs/web: add assert() statements for unresolvable function case
---

diff --git a/libs/web/luasrc/dispatcher.lua b/libs/web/luasrc/dispatcher.lua
index 911f2f4e9..7c77f2e97 100644
--- a/libs/web/luasrc/dispatcher.lua
+++ b/libs/web/luasrc/dispatcher.lua
@@ -761,10 +761,18 @@ end
 
 
 local function _call(self, ...)
+	local func = getfenv()[self.name]
+	assert(func ~= nil,
+	       'Cannot resolve function "' .. self.name .. '". Is it misspelled or local?')
+
+	assert(type(func) == "function",
+	       'The symbol "' .. self.name .. '" does not refer to a function but data ' ..
+	       'of type "' .. type(func) .. '".')
+
 	if #self.argv > 0 then
-		return getfenv()[self.name](unpack(self.argv), ...)
+		return func(unpack(self.argv), ...)
 	else
-		return getfenv()[self.name](...)
+		return func(...)
 	end
 end