[Scummvm-git-logs] scummvm branch-2-2 -> 230e1dc4cf1635aba410b72dc3c12f4d04665bdb

[dreammaster]

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:
c6437b3d67 GLK: LEVEL9: Fix memory overrun in game detector
230e1dc4cf NUVIE: Fix character name in portrait display


Commit: c6437b3d676a25591256049b2a7501faa019218c
    https://github.com/scummvm/scummvm/commit/c6437b3d676a25591256049b2a7501faa019218c
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2020-09-29T21:32:05-07:00

Commit Message:
GLK: LEVEL9: Fix memory overrun in game detector

Changed paths:
    engines/glk/level9/detection.cpp


diff --git a/engines/glk/level9/detection.cpp b/engines/glk/level9/detection.cpp
index adb416e46a..6b19ce3010 100644
--- a/engines/glk/level9/detection.cpp
+++ b/engines/glk/level9/detection.cpp
@@ -155,7 +155,7 @@ long Scanner::ScanV2(byte *startFile, uint32 size) {
 
 	for (i = 0; i < size - 28; i++) {
 		num = L9WORD(startFile + i + 28) + 1;
-		if (i + num <= size && ((Chk[i + num] - Chk[i + 32]) & 0xff) == startFile[i + 0x1e]) {
+		if ((i + num) <= size && i < (size - 32) && ((Chk[i + num] - Chk[i + 32]) & 0xff) == startFile[i + 0x1e]) {
 			for (j = 0; j < 14; j++) {
 				d0 = L9WORD(startFile + i + j * 2);
 				if (j != 13 && d0 >= 0x8000 && d0 < 0x9000) {
@@ -743,7 +743,7 @@ bool Level9MetaEngine::detectGames(const Common::FSList &fslist, DetectedGames &
 
 		// Read in the game data
 		Common::Array<byte> data;
-		data.resize(fileSize);
+		data.resize(fileSize + 1);
 		gameFile.read(&data[0], fileSize);
 		gameFile.close();
 


Commit: 230e1dc4cf1635aba410b72dc3c12f4d04665bdb
    https://github.com/scummvm/scummvm/commit/230e1dc4cf1635aba410b72dc3c12f4d04665bdb
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2020-09-29T21:32:18-07:00

Commit Message:
NUVIE: Fix character name in portrait display

Changed paths:
    engines/ultima/nuvie/core/converse.cpp


diff --git a/engines/ultima/nuvie/core/converse.cpp b/engines/ultima/nuvie/core/converse.cpp
index ed0e16ee5f..5548f59a38 100644
--- a/engines/ultima/nuvie/core/converse.cpp
+++ b/engines/ultima/nuvie/core/converse.cpp
@@ -121,8 +121,10 @@ Converse::~Converse() {
 void Converse::reset() {
 	delete conv_i;
 	conv_i = NULL;
-	set_input(""); // delete
-	set_output(""); // clear output
+	set_input("");	// delete
+	set_output("");	// clear output
+	_name = "";		// clear name
+
 	if (script) {
 		delete script;
 		script = NULL;