[Scummvm-git-logs] scummvm master -> 5031036421f40d3f21fb6e41c21cb750459c1a8e

sev- noreply at scummvm.org
Fri Dec 24 20:59:06 UTC 2021


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:
18a56a084a AGS: Fix new[]/delete mismatch
5031036421 SUPERNOVA: Fix new[]/delete mismatch


Commit: 18a56a084a5946df7abba10d569b3fffdf204a88
    https://github.com/scummvm/scummvm/commit/18a56a084a5946df7abba10d569b3fffdf204a88
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-12-24T21:56:29+01:00

Commit Message:
AGS: Fix new[]/delete mismatch

Changed paths:
    engines/ags/shared/game/room_file.cpp


diff --git a/engines/ags/shared/game/room_file.cpp b/engines/ags/shared/game/room_file.cpp
index 0091f62b03..0cda427eb3 100644
--- a/engines/ags/shared/game/room_file.cpp
+++ b/engines/ags/shared/game/room_file.cpp
@@ -474,7 +474,7 @@ public:
 		char *buf = nullptr;
 		err = ReadScriptBlock(buf, _in, _dataVer);
 		script = buf;
-		delete buf;
+		delete[] buf;
 		return err;
 	}
 
@@ -642,7 +642,7 @@ HError ExtractScriptTextReader(Stream *in, int block_id,
 		HError err = ReadScriptBlock(buf, in, reader_ver);
 		if (err) {
 			*reader_script = buf;
-			delete buf;
+			delete[] buf;
 		}
 		return err;
 	}


Commit: 5031036421f40d3f21fb6e41c21cb750459c1a8e
    https://github.com/scummvm/scummvm/commit/5031036421f40d3f21fb6e41c21cb750459c1a8e
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-12-24T21:58:43+01:00

Commit Message:
SUPERNOVA: Fix new[]/delete mismatch

Changed paths:
    engines/supernova/screen.cpp


diff --git a/engines/supernova/screen.cpp b/engines/supernova/screen.cpp
index e011edfb56..973091f54b 100644
--- a/engines/supernova/screen.cpp
+++ b/engines/supernova/screen.cpp
@@ -142,7 +142,7 @@ Marquee::Marquee(Screen *screen, MarqueeId id, const char *text)
 Marquee::~Marquee() {
 	if (_screen->_vm->_MSPart == 2) {
 		_screen->_vm->_system->getPaletteManager()->setPalette(_oldColor, kColorPurple, 1);
-		delete _oldColor;
+		delete[] _oldColor;
 	}
 }
 




More information about the Scummvm-git-logs mailing list