BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Check for valid base64 before decoding (#9904)

Browse Source
This commit is contained in:
Lejo1 2020-05-20 21:54:52 +02:00 committed by SmallJoker
parent 7ab0c0662a
commit e79bc40c0a
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/lua_api.txt
View File

@ -5449,7 +5449,7 @@ Misc.
* Example: `minetest.rgba(10, 20, 30, 40)`, returns `"#0A141E28"` * Example: `minetest.rgba(10, 20, 30, 40)`, returns `"#0A141E28"`
* `minetest.encode_base64(string)`: returns string encoded in base64 * `minetest.encode_base64(string)`: returns string encoded in base64
* Encodes a string in base64. * Encodes a string in base64.
* `minetest.decode_base64(string)`: returns string * `minetest.decode_base64(string)`: returns string or nil for invalid base64
* Decodes a string encoded in base64. * Decodes a string encoded in base64.
* `minetest.is_protected(pos, name)`: returns boolean * `minetest.is_protected(pos, name)`: returns boolean
* Returning `true` restricts the player `name` from modifying (i.e. digging, * Returning `true` restricts the player `name` from modifying (i.e. digging,

8
src/script/lua_api/l_util.cpp
View File

@ -318,9 +318,13 @@ int ModApiUtil::l_decode_base64(lua_State *L)
NO_MAP_LOCK_REQUIRED; NO_MAP_LOCK_REQUIRED;
size_t size; size_t size;
const char *data = luaL_checklstring(L, 1, &size); const char *d = luaL_checklstring(L, 1, &size);
const std::string data = std::string(d, size);
std::string out = base64_decode(std::string(data, size)); if (!base64_is_valid(data))
return 0;
std::string out = base64_decode(data);
lua_pushlstring(L, out.data(), out.size()); lua_pushlstring(L, out.data(), out.size());
return 1; return 1;