flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

LuaAPI: Fixed possible crashes in HTTPRequest bindings.

Browse Source
This commit is contained in:
Mattes D 2016-09-26 12:47:40 +02:00
parent 7fdcba657d
commit b1530bb28e
1 changed files with 44 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
src/Bindings/ManualBindings.cpp
View File

@ -1910,20 +1910,17 @@ static int tolua_sha1HexString(lua_State * tolua_S)
static int tolua_push_StringStringMap(lua_State* tolua_S, std::map< std::string, std::string >& a_StringStringMap) static int tolua_get_HTTPRequest_Params(lua_State * a_LuaState)
{ {
lua_newtable(tolua_S); cLuaState L(a_LuaState);
int top = lua_gettop(tolua_S); HTTPRequest * self;
if (!L.GetStackValues(1, self))
for (std::map<std::string, std::string>::iterator it = a_StringStringMap.begin(); it != a_StringStringMap.end(); ++it)
{ {
const char * key = it->first.c_str(); tolua_Error err;
const char * value = it->second.c_str(); tolua_error(a_LuaState, "Invalid self parameter, expected a HTTPRequest instance", &err);
lua_pushstring(tolua_S, key); return 0;
lua_pushstring(tolua_S, value);
lua_settable(tolua_S, top);
} }
L.Push(self->Params);
return 1; return 1;
} }
@ -1931,40 +1928,44 @@ static int tolua_push_StringStringMap(lua_State* tolua_S, std::map< std::string,
static int tolua_get_HTTPRequest_Params(lua_State* tolua_S) static int tolua_get_HTTPRequest_PostParams(lua_State * a_LuaState)
{ {
HTTPRequest * self = reinterpret_cast<HTTPRequest *>(tolua_tousertype(tolua_S, 1, nullptr)); cLuaState L(a_LuaState);
return tolua_push_StringStringMap(tolua_S, self->Params); HTTPRequest * self;
if (!L.GetStackValues(1, self))
{
tolua_Error err;
tolua_error(a_LuaState, "Invalid self parameter, expected a HTTPRequest instance", &err);
return 0;
}
L.Push(self->PostParams);
return 1;
} }
static int tolua_get_HTTPRequest_PostParams(lua_State* tolua_S) static int tolua_get_HTTPRequest_FormData(lua_State* a_LuaState)
{ {
HTTPRequest * self = reinterpret_cast<HTTPRequest *>(tolua_tousertype(tolua_S, 1, nullptr)); cLuaState L(a_LuaState);
return tolua_push_StringStringMap(tolua_S, self->PostParams); HTTPRequest * self;
if (!L.GetStackValues(1, self))
{
tolua_Error err;
tolua_error(a_LuaState, "Invalid self parameter, expected a HTTPRequest instance", &err);
return 0;
} }
const auto & FormData = self->FormData;
lua_newtable(a_LuaState);
int top = lua_gettop(a_LuaState);
for (auto itr = FormData.cbegin(); itr != FormData.cend(); ++itr)
static int tolua_get_HTTPRequest_FormData(lua_State* tolua_S)
{ {
HTTPRequest * self = reinterpret_cast<HTTPRequest *>(tolua_tousertype(tolua_S, 1, nullptr)); lua_pushstring(a_LuaState, itr->first.c_str());
std::map<std::string, HTTPFormData> & FormData = self->FormData; tolua_pushusertype(a_LuaState, const_cast<void *>(reinterpret_cast<const void *>(&(itr->second))), "HTTPFormData");
// lua_pushlstring(a_LuaState, it->second.Value.c_str(), it->second.Value.size()); // Might contain binary data
lua_newtable(tolua_S); lua_settable(a_LuaState, top);
int top = lua_gettop(tolua_S);
for (std::map<std::string, HTTPFormData>::iterator it = FormData.begin(); it != FormData.end(); ++it)
{
lua_pushstring(tolua_S, it->first.c_str());
tolua_pushusertype(tolua_S, &(it->second), "HTTPFormData");
// lua_pushlstring(tolua_S, it->second.Value.c_str(), it->second.Value.size()); // Might contain binary data
lua_settable(tolua_S, top);
} }
return 1; return 1;