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

Strangerke noreply at scummvm.org
Mon May 1 06:38:16 UTC 2023


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:
eafd061334 KINGDOM: Fix potential memory leak
f3eb5af91e KINGDOM: Fixa nasty bug in logic (pointed out by PVS-Studio), group identical cases in a switch


Commit: eafd061334a9aab4017b95b5d3d8661401aff46b
    https://github.com/scummvm/scummvm/commit/eafd061334a9aab4017b95b5d3d8661401aff46b
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2023-05-01T07:37:56+01:00

Commit Message:
KINGDOM: Fix potential memory leak

Changed paths:
    engines/kingdom/kingdom.cpp


diff --git a/engines/kingdom/kingdom.cpp b/engines/kingdom/kingdom.cpp
index 253c9683edc..24beb7787a5 100644
--- a/engines/kingdom/kingdom.cpp
+++ b/engines/kingdom/kingdom.cpp
@@ -380,8 +380,8 @@ void KingdomGame::loadAResource(int reznum) {
 			file->seek(0, SEEK_SET);
 			_rezPointers[reznum] = file->readStream(_rezSize[reznum]);
 			file->close();
-			delete file;
 		}
+		delete file;
 	}
 }
 


Commit: f3eb5af91e6a684de8262a387a441d017e69b29c
    https://github.com/scummvm/scummvm/commit/f3eb5af91e6a684de8262a387a441d017e69b29c
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2023-05-01T07:37:56+01:00

Commit Message:
KINGDOM: Fixa nasty bug in logic (pointed out by PVS-Studio), group identical cases in a switch

Changed paths:
    engines/kingdom/logic.cpp
    engines/kingdom/logic1.cpp


diff --git a/engines/kingdom/logic.cpp b/engines/kingdom/logic.cpp
index ab014234b55..627bf769913 100644
--- a/engines/kingdom/logic.cpp
+++ b/engines/kingdom/logic.cpp
@@ -478,6 +478,9 @@ void Logic::gameHelp() {
 		//TODO: Set _quitFlag to 1
 		break;
 	case 0x241:
+	case 0x43B:
+	case 0x43C:
+	case 0x44F:
 		// Resume game
 		gameHelp_Sub43C();
 		return;
@@ -540,11 +543,8 @@ void Logic::gameHelp() {
 	case 0x246:
 		_vm->saveGame();
 		break;
-	case 0x43B:
-	case 0x43C:
-	case 0x44F:
-		gameHelp_Sub43C();
-		return;
+	default:
+		break;
 	}
 
 	if (_vm->_userInput > 0x427 && _vm->_userInput < 0x43A)
diff --git a/engines/kingdom/logic1.cpp b/engines/kingdom/logic1.cpp
index e8979835627..a880d452624 100644
--- a/engines/kingdom/logic1.cpp
+++ b/engines/kingdom/logic1.cpp
@@ -699,7 +699,7 @@ void Logic::GPL1_121() {
 			GPLogic1_SubSP121();
 		break;
 	case 0x43E:
-		if (_vm->_pMovie == 023)
+		if (_vm->_pMovie == 23)
 			GPLogic1_SubSP121();
 		else {
 			_vm->_sound = _vm->_lastSound;




More information about the Scummvm-git-logs mailing list