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

[sev-]

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

Summary:
fee8ebfe16 GLK: SCOTT: Fix C64 detection buffer ownership


Commit: fee8ebfe1611d9dbb8ea27dfae52419cfbf2f4ee
    https://github.com/scummvm/scummvm/commit/fee8ebfe1611d9dbb8ea27dfae52419cfbf2f4ee
Author: Shadow Maker (shm at vtrd.in)
Date: 2026-05-31T13:32:06+02:00

Commit Message:
GLK: SCOTT: Fix C64 detection buffer ownership

Keep temporary D64/T64 extraction buffers in ScopedPtr until they are transferred to the loaded file pointer. This avoids leaking the D64 replacement buffer on failure paths and releases the previous loaded buffer when detectC64 replaces it.

Changed paths:
    engines/glk/scott/c64_checksums.cpp


diff --git a/engines/glk/scott/c64_checksums.cpp b/engines/glk/scott/c64_checksums.cpp
index ad2be4e0720..4bf9fb9106c 100644
--- a/engines/glk/scott/c64_checksums.cpp
+++ b/engines/glk/scott/c64_checksums.cpp
@@ -32,6 +32,7 @@
 
 #include "common/str.h"
 #include "common/scummsys.h"
+#include "common/ptr.h"
 #include "glk/scott/scott.h"
 #include "glk/scott/globals.h"
 #include "glk/scott/c64_checksums.h"
@@ -413,31 +414,34 @@ int detectC64(uint8_t **sf, size_t *extent) {
 	}
 	if (g_C64Registry[index]._type == TYPE_D64) {
 		int newlength;
-		uint8_t *largest_file = getLargestFile(*sf, *extent, &newlength);
-		uint8_t *appendix = nullptr;
+		Common::ScopedPtr<uint8_t, Common::ArrayDeleter<uint8_t> > largestFile(getLargestFile(*sf, *extent, &newlength));
+		Common::ScopedPtr<uint8_t, Common::ArrayDeleter<uint8_t> > appendix;
 		int appendixlen = 0;
 
 		if (g_C64Registry[index]._appendFile != nullptr) {
-			appendix = getFileNamed(*sf, *extent, &appendixlen, g_C64Registry[index]._appendFile);
-			if (appendix == nullptr)
+			appendix.reset(getFileNamed(*sf, *extent, &appendixlen, g_C64Registry[index]._appendFile));
+			if (!appendix)
 				error("detectC64(): Appending file failed");
 			appendixlen -= 2;
 		}
 
-		uint8_t *megabuf = new uint8_t[newlength + appendixlen];
-		memcpy(megabuf, largest_file, newlength);
-		if (appendix != nullptr) {
-			memcpy(megabuf + newlength + g_C64Registry[index]._parameter, appendix + 2, appendixlen);
-			newlength += appendixlen;
-		}
-		delete[] appendix;
+		if (!largestFile)
+			error("detectC64(): Failed loading largest file");
 
-		if (largest_file) {
-			*sf = megabuf;
-			*extent = newlength;
+		size_t newExtent = newlength;
+		Common::ScopedPtr<uint8_t, Common::ArrayDeleter<uint8_t> > replacement;
+		if (appendix) {
+			replacement.reset(new uint8_t[newlength + appendixlen]);
+			memcpy(replacement.get(), largestFile.get(), newlength);
+			memcpy(replacement.get() + newlength + g_C64Registry[index]._parameter, appendix.get() + 2, appendixlen);
+			newExtent += appendixlen;
+		} else {
+			replacement.reset(largestFile.release());
 		}
-		delete[] largest_file;
 
+		delete[] *sf;
+		*sf = replacement.release();
+		*extent = newExtent;
 	} else if (g_C64Registry[index]._type == TYPE_T64) {
 		uint8_t *file_records = *sf + 64;
 		int number_of_records = READ_LE_UINT16(&(*sf)[36]);
@@ -449,10 +453,11 @@ int detectC64(uint8_t **sf, size_t *extent) {
 			size = *extent - offset;
 		else
 			size = end_addr - start_addr;
-		uint8_t *first_file = new uint8_t[size + 2];
-		memcpy(first_file + 2, *sf + offset, size);
-		memcpy(first_file, file_records + 2, 2);
-		*sf = first_file;
+		Common::ScopedPtr<uint8_t, Common::ArrayDeleter<uint8_t> > firstFile(new uint8_t[size + 2]);
+		memcpy(firstFile.get() + 2, *sf + offset, size);
+		memcpy(firstFile.get(), file_records + 2, 2);
+		delete[] *sf;
+		*sf = firstFile.release();
 		*extent = size + 2;
 	}
 	return decrunchC64(sf, extent, g_C64Registry[index]);