[Scummvm-git-logs] scummvm master -> b517ab6635048c694f173bc8a1826d8202a4c5ff

rvanlaar noreply at scummvm.org
Tue Sep 20 09:05:20 UTC 2022


This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
980e136c77 DIRECTOR: Fix memory leak
b517ab6635 GRAPHICS: MACGUI: Fix memory leak in scaleFont


Commit: 980e136c77e88daac8518c4e4dbc09ce0fa98693
    https://github.com/scummvm/scummvm/commit/980e136c77e88daac8518c4e4dbc09ce0fa98693
Author: Roland van Laar (roland at rolandvanlaar.nl)
Date: 2022-09-20T11:04:58+02:00

Commit Message:
DIRECTOR: Fix memory leak

Delete iniSteam after use.

Changed paths:
    engines/director/resource.cpp


diff --git a/engines/director/resource.cpp b/engines/director/resource.cpp
index 48044aef0e6..7d77ea8819e 100644
--- a/engines/director/resource.cpp
+++ b/engines/director/resource.cpp
@@ -219,6 +219,7 @@ void Window::loadEXE(const Common::String movie) {
 	} else {
 		warning("No LINGO.INI");
 	}
+	delete iniStream;
 
 	Common::SeekableReadStream *exeStream = SearchMan.createReadStreamForMember(Common::Path(movie, g_director->_dirSeparator));
 	if (!exeStream)


Commit: b517ab6635048c694f173bc8a1826d8202a4c5ff
    https://github.com/scummvm/scummvm/commit/b517ab6635048c694f173bc8a1826d8202a4c5ff
Author: Roland van Laar (roland at rolandvanlaar.nl)
Date: 2022-09-20T11:04:58+02:00

Commit Message:
GRAPHICS: MACGUI: Fix memory leak in scaleFont

Free all surfaces after use.

Changed paths:
    graphics/fonts/macfont.cpp


diff --git a/graphics/fonts/macfont.cpp b/graphics/fonts/macfont.cpp
index f7de9f0fd52..92b9a6d48db 100644
--- a/graphics/fonts/macfont.cpp
+++ b/graphics/fonts/macfont.cpp
@@ -729,6 +729,7 @@ MacFONTFont *MacFONTFont::scaleFont(const MacFONTFont *src, int newSize, int sla
 	}
 
 	srcSurf.free();
+	tmpSurf.free();
 	free(dstGray);
 
 	return new MacFONTFont(data);




More information about the Scummvm-git-logs mailing list