fix lua module register crash

starwing · Jun 6, 2018 · 7f92d67 · 7f92d67
1 parent a7dd85a
commit 7f92d67
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/pb.c b/pb.c
@@ -1659,7 +1659,8 @@ LUALIB_API int luaopen_pb(lua_State *L) {
     };
     luaL_Reg meta[] = {
         { "__gc", Lpb_delete },
-        { "setdefault", Lpb_state }
+        { "setdefault", Lpb_state },
+        { NULL, NULL }
     };
     if (luaL_newmetatable(L, PB_STATE)) {
         luaL_setfuncs(L, meta, 0);

diff --git a/protoc.lua b/protoc.lua
@@ -266,7 +266,7 @@ function Parser:parsefile(name)
    if info then return info end
    local errors = {}
    for _, path in ipairs(self.paths) do
-      local fn = path.."/"..name
+      local fn = path ~= "" and path.."/"..name or name
       local fh, err = io.open(fn)
       if fh then
          local content = fh:read "*a"