minetest
/
minetest
mirror of https://github.com/minetest/minetest.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Plug two minor Leaks (#5603) 

* Resource leak: CHECK_FILE_ERR returns, without freeing chunk_name.

Found with static analysis.

* Resource leak: leaks `page` on error path.

Found with static analysis.
This commit is contained in:
Auke Kok 2017-04-17 00:04:58 -07:00 committed by Loïc Blot
parent 73de17afa8
commit 97988a1044
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/cguittfont/CGUITTFont.cpp
View File

@ -512,9 +512,11 @@ CGUITTGlyphPage* CGUITTFont::createGlyphPage(const u8& pixel_mode)
if (page_texture_size.Width > max_texture_size.Width || page_texture_size.Height > max_texture_size.Height)
page_texture_size = max_texture_size;
if (!page->createPageTexture(pixel_mode, page_texture_size))
if (!page->createPageTexture(pixel_mode, page_texture_size)) {
// TODO: add error message?
delete page;
return 0;
}
if (page)
{

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

@ -406,7 +406,14 @@ bool ScriptApiSecurity::safeLoadFile(lua_State *L, const char *path)
// Read the file
int ret = std::fseek(fp, 0, SEEK_END);
CHECK_FILE_ERR(ret, fp);
if (ret) {
lua_pushfstring(L, "%s: %s", path, strerror(errno));
std::fclose(fp);
if (path) {
delete [] chunk_name;
}
return false;
}
size_t size = std::ftell(fp) - start;
char *code = new char[size];