Skip to content
Permalink
Browse files

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.
  • Loading branch information
sofar authored and nerzhul committed Apr 17, 2017
1 parent 73de17a commit 97988a1044e0fce20a6ddc9e9cb6be395101cb2a
Showing with 11 additions and 2 deletions.
  1. +3 −1 src/cguittfont/CGUITTFont.cpp
  2. +8 −1 src/script/cpp_api/s_security.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)
{
@@ -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];

0 comments on commit 97988a1

Please sign in to comment.
You can’t perform that action at this time.