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

[sev-]

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:
b44cc897d0 DIRECTOR: Fix memory leak when loading an unsupported file
ae903d4940 DIRECTOR: Fix possible memory leak when loading an unhandled EXE version


Commit: b44cc897d0c3dc8fc38217d8c34489fcb2488b78
    https://github.com/scummvm/scummvm/commit/b44cc897d0c3dc8fc38217d8c34489fcb2488b78
Author: eientei (einstein95 at users.noreply.github.com)
Date: 2023-02-25T11:35:24+01:00

Commit Message:
DIRECTOR: Fix memory leak when loading an unsupported file

Changed paths:
    engines/director/resource.cpp


diff --git a/engines/director/resource.cpp b/engines/director/resource.cpp
index 63651b581c9..5adc6bd9b40 100644
--- a/engines/director/resource.cpp
+++ b/engines/director/resource.cpp
@@ -302,6 +302,9 @@ Archive *Window::loadEXE(const Common::String movie) {
 
 	if (result)
 		result->setPathName(movie);
+	else
+		delete exeStream;
+
 	return result;
 }
 


Commit: ae903d49403d71c5e3482abd274cd283a6bfa9be
    https://github.com/scummvm/scummvm/commit/ae903d49403d71c5e3482abd274cd283a6bfa9be
Author: eientei (einstein95 at users.noreply.github.com)
Date: 2023-02-25T11:35:24+01:00

Commit Message:
DIRECTOR: Fix possible memory leak when loading an unhandled EXE version

Changed paths:
    engines/director/resource.cpp


diff --git a/engines/director/resource.cpp b/engines/director/resource.cpp
index 5adc6bd9b40..9b27f263261 100644
--- a/engines/director/resource.cpp
+++ b/engines/director/resource.cpp
@@ -296,6 +296,7 @@ Archive *Window::loadEXE(const Common::String movie) {
 			result = loadEXEv3(exeStream);
 		} else {
 			warning("Window::loadEXE(): Unhandled Windows EXE version %d", g_director->getVersion());
+			delete exeStream;
 			return nullptr;
 		}
 	}