[Scummvm-git-logs] scummvm master -> 8ea7c381d04defa2868ef41d662d428c59858cd9

sev- sev at scummvm.org
Sat Apr 11 11:30:11 UTC 2020


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

Summary:
8ea7c381d0 DIRECTOR: Fix regression brought by new implementation of toString()


Commit: 8ea7c381d04defa2868ef41d662d428c59858cd9
    https://github.com/scummvm/scummvm/commit/8ea7c381d04defa2868ef41d662d428c59858cd9
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-04-11T13:29:30+02:00

Commit Message:
DIRECTOR: Fix regression brought by new implementation of toString()

If we leak memory, that's a different problem

Changed paths:
    engines/director/lingo/lingo.cpp


diff --git a/engines/director/lingo/lingo.cpp b/engines/director/lingo/lingo.cpp
index 6f1caaa27c..5698a406b8 100644
--- a/engines/director/lingo/lingo.cpp
+++ b/engines/director/lingo/lingo.cpp
@@ -537,9 +537,6 @@ Common::String *Datum::makeString(bool printonly) {
 	if (printonly)
 		return s;
 
-	if (type == STRING)
-		delete u.s;
-
 	u.s = s;
 	type = STRING;
 




More information about the Scummvm-git-logs mailing list