Merge pull request #15 from spacewander/pass_lua_str_directly

pass Lua string directly instead of creating a new copy.
anjia0532 · Dec 11, 2018 · d9dd5bd · d9dd5bd
2 parents 6776c70 + db8d966
commit d9dd5bd
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/lib/resty/maxminddb.lua b/lib/resty/maxminddb.lua
@@ -162,15 +162,15 @@ end
 
 function _M.init(dbfile)
   if not initted then
-    local file_name_ip2   = ffi_new('char[?]',#dbfile,dbfile)
-    local maxmind_ready   = maxm.MMDB_open(file_name_ip2,0,mmdb)
+    local maxmind_ready   = maxm.MMDB_open(dbfile,0,mmdb)
 
     if maxmind_ready ~= MMDB_SUCCESS then
         return nil, mmdb_strerror(maxmind_ready)
     end
-
-    ffi_gc(mmdb, maxm.MMDB_close)
+
     initted = true
+
+    ffi_gc(mmdb, maxm.MMDB_close)
   end
   return initted
 end
@@ -316,11 +316,10 @@ function _M.lookup(ip)
       return nil, "not initialized"
   end
 
-  local ip_str = ffi_cast('const char *',ffi_new('char[?]',#ip+1,ip))
   local gai_error = ffi_new('int[1]')
   local mmdb_error = ffi_new('int[1]')
 
-  local result = maxm.MMDB_lookup_string(mmdb,ip_str,gai_error,mmdb_error)
+  local result = maxm.MMDB_lookup_string(mmdb,ip,gai_error,mmdb_error)
 
   if mmdb_error[0] ~= MMDB_SUCCESS then
     return nil,'fail when lookup'