minetest/minetest
1
0
Fork 0
mirror of https://github.com/minetest/minetest.git synced 2025-06-30 23:20:22 +02:00
Code Issues Releases Wiki Activity

couple of memory leaks fixes.

Browse Source
This commit is contained in:
David Carlier
2016-07-28 08:56:22 +01:00
parent c8b4bedaa8
commit c7910827d7
5 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/script/cpp_api/s_security.cpp
View File

@ -285,6 +285,10 @@ bool ScriptApiSecurity::safeLoadFile(lua_State *L, const char *path)
if (c == LUA_SIGNATURE[0]) {
lua_pushliteral(L, "Bytecode prohibited when mod security is enabled.");
std::fclose(fp);
if (path) {
delete [] chunk_name;
}
return false;
}
@ -295,7 +299,15 @@ bool ScriptApiSecurity::safeLoadFile(lua_State *L, const char *path)
size_t size = std::ftell(fp) - start;
char *code = new char[size];
ret = std::fseek(fp, start, SEEK_SET);
CHECK_FILE_ERR(ret, fp);
if (ret) {
lua_pushfstring(L, "%s: %s", path, strerror(errno));
std::fclose(fp);
delete [] code;
if (path) {
delete [] chunk_name;
}
return false;
}
size_t num_read = std::fread(code, 1, size, fp);
if (path) {
@ -303,6 +315,10 @@ bool ScriptApiSecurity::safeLoadFile(lua_State *L, const char *path)
}
if (num_read != size) {
lua_pushliteral(L, "Error reading file to load.");
delete [] code;
if (path) {
delete [] chunk_name;
}
return false;
}