TONY: Properly free dialog commands during loading when there is dupl…

…icates
scummvm · Jun 9, 2012 · 8d6f504 · 8d6f504
1 parent 5e062ce
commit 8d6f504
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/engines/tony/mpal/loadmpc.cpp b/engines/tony/mpal/loadmpc.cpp
@@ -238,6 +238,16 @@ static const byte *parseDialog(const byte *lpBuf, LPMPALDIALOG lpmdDialog) {
 			for (kk = 0;kk < curCmd; kk++) {
 				if (compareCommands(&lpmdDialog->_command[kk], &lpmdDialog->_command[curCmd])) {
 					lpmdDialog->_group[i].CmdNum[j] = kk;
+
+					// Free any data allocated for the duplictaed command
+					if (lpmdDialog->_command[curCmd].type == 2) {
+						globalDestroy(lpmdDialog->_command[curCmd].lpszVarName);
+						freeExpression(lpmdDialog->_command[curCmd].expr);
+
+						lpmdDialog->_command[curCmd].lpszVarName = NULL;
+						lpmdDialog->_command[curCmd].expr = 0;
+						lpmdDialog->_command[curCmd].type = 0;
+					}
 					break;
 				}
 			}