diff options
| author | Auke Kok <sofar+github@foo-projects.org> | 2017-04-17 00:04:58 -0700 |
|---|---|---|
| committer | Loïc Blot <nerzhul@users.noreply.github.com> | 2017-04-17 09:04:58 +0200 |
| commit | 97988a1044e0fce20a6ddc9e9cb6be395101cb2a (patch) | |
| tree | f7f1eb194bd86cb241ca5488705ff092353dcdb2 /src | |
| parent | 73de17afa821ccea84a119096b267e05a77db3ff (diff) | |
| download | minetest-97988a1044e0fce20a6ddc9e9cb6be395101cb2a.tar.gz minetest-97988a1044e0fce20a6ddc9e9cb6be395101cb2a.tar.bz2 minetest-97988a1044e0fce20a6ddc9e9cb6be395101cb2a.zip | |
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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/cguittfont/CGUITTFont.cpp | 4 | ||||
| -rw-r--r-- | src/script/cpp_api/s_security.cpp | 9 |
2 files changed, 11 insertions, 2 deletions
diff --git a/src/cguittfont/CGUITTFont.cpp b/src/cguittfont/CGUITTFont.cpp index c2d37c6c0..bd4e700de 100644 --- a/src/cguittfont/CGUITTFont.cpp +++ b/src/cguittfont/CGUITTFont.cpp @@ -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) { diff --git a/src/script/cpp_api/s_security.cpp b/src/script/cpp_api/s_security.cpp index ec3a52e8e..5ad7947d5 100644 --- a/src/script/cpp_api/s_security.cpp +++ b/src/script/cpp_api/s_security.cpp @@ -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]; |