kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

elua: prevent method calls on bad objects

This commit is contained in:
Daniel Kolesa 2014-06-05 11:15:29 +01:00
parent 5ee0d530ca
commit 39cdde7280
2 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/bin/elua/modules/lualian.lua
View File

@ -212,7 +212,7 @@ local Method = Node:clone {
local proto = self:gen_proto()
s:write(" ", proto.name, proto.suffix or "", " = function(",
table.concat(proto.args, ", "), ")\n")
s:write( " self:__do_start()\n")
s:write( " self:__do_start(__class)\n")
for i, v in ipairs(proto.allocs) do
s:write(" local ", v[2], " = ffi.new(\"", v[1], "[1]\")\n")
end
@ -389,8 +389,8 @@ local Constructor = Method:clone {
end
local genv = (proto.ret_type ~= "void")
s:write(" ", genv and "local v = " or "", "self:__ctor_common(",
"__lib.", self.parent_node.prefix, "_class_get(), parent, __lib.",
proto.full_name, ", ", table.concat(proto.vargs, ", "), ")\n")
"__class, parent, __lib.", proto.full_name, ", ",
table.concat(proto.vargs, ", "), ")\n")
if not defctor then
table.insert(proto.rets, 1, "self")
end
@ -410,8 +410,7 @@ local Default_Constructor = Node:clone {
s:write( " __ctor = function(self, parent)\n")
s:write(" self:__define_properties(self.__proto.__proto)\n")
s:write(" self:__ctor_common(__lib.", self.parent_node.prefix,
"_class_get(), parent)\n")
s:write(" self:__ctor_common(__class, parent)\n")
s:write(" end", last and "" or ",", last and "\n" or "\n\n")
end,
@ -448,8 +447,10 @@ local Mixin = Node:clone {
ename = self.klass:name_get()
end
s:write(("M.%s = eo.class_register(\"%s\", {\n"):format(
ename, self.klass:full_name_get()))
s:write(([[
local __class = __lib.%s_class_get()
M.%s = eo.class_register("%s", {
]]):format(self.prefix, ename, self.klass:full_name_get()))
self:gen_children(s)
@ -508,9 +509,10 @@ local Class = Node:clone {
end
s:write(([[
local Parent = eo.class_get("%s")
local __class = __lib.%s_class_get()
local Parent = eo.class_get("%s")
M.%s = eo.class_register("%s", Parent:clone {
]]):format(self.parent, ename, self.klass:full_name_get()))
]]):format(self.prefix, self.parent, ename, self.klass:full_name_get()))
self:gen_children(s)

7
src/bindings/luajit/eo.lua
View File

@ -12,6 +12,8 @@ ffi.cdef [[
Eina_Bool eo_init(void);
Eina_Bool eo_shutdown(void);
Eina_Bool eo_isa(const Eo *obj, const Eo_Class *klass);
void eo_constructor(void);
void eo_destructor(void);
@ -92,7 +94,10 @@ M.Eo_Base = util.Object:clone {
return retval
end,
__do_start = function(self)
__do_start = function(self, klass)
if eo.eo_isa(self.__obj, klass) == 0 then
error("method call on an invalid object", 3)
end
local info = getinfo(3, "nlSf")
return eo._eo_do_start(self.__obj, nil, false, info.source,
getfuncname(info), info.currentline) ~= 0