[Scummvm-git-logs] scummvm branch-2-5 -> fe35a83844fd4c5ed86c1d85ec1ec89ce397702f

[eriktorbjorn]

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:
71cce14c7d SHERLOCK: Fix Rose Tattoo crash when moving past end of string
fe35a83844 NEWS: Mention Rose Tatto save dialog crash fix


Commit: 71cce14c7dd07df84df5852a099eb4aa5b9cbc38
    https://github.com/scummvm/scummvm/commit/71cce14c7dd07df84df5852a099eb4aa5b9cbc38
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2021-12-16T20:34:49+01:00

Commit Message:
SHERLOCK: Fix Rose Tattoo crash when moving past end of string

Changed paths:
    engines/sherlock/tattoo/widget_files.cpp


diff --git a/engines/sherlock/tattoo/widget_files.cpp b/engines/sherlock/tattoo/widget_files.cpp
index 5e877c53f4..b2518ff6f1 100644
--- a/engines/sherlock/tattoo/widget_files.cpp
+++ b/engines/sherlock/tattoo/widget_files.cpp
@@ -328,7 +328,7 @@ bool WidgetFiles::getFilename() {
 			_surface.writeString(filename.c_str() + index, pt, COMMAND_HIGHLIGHTED);
 
 		} else if ((keyState.keycode == Common::KEYCODE_LEFT && index > 0)
-				|| (keyState.keycode == Common::KEYCODE_RIGHT && index < 49 && pt.x < (_bounds.right - BUTTON_SIZE - 20))
+				|| (keyState.keycode == Common::KEYCODE_RIGHT && index < (int)filename.size() && pt.x < (_bounds.right - BUTTON_SIZE - 20))
 				|| (keyState.keycode == Common::KEYCODE_HOME && index > 0)
 				|| (keyState.keycode == Common::KEYCODE_END)) {
 			_surface.fillRect(Common::Rect(pt.x, pt.y, pt.x + width, pt.y + _surface.fontHeight()), TRANSPARENCY);


Commit: fe35a83844fd4c5ed86c1d85ec1ec89ce397702f
    https://github.com/scummvm/scummvm/commit/fe35a83844fd4c5ed86c1d85ec1ec89ce397702f
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2021-12-16T20:36:42+01:00

Commit Message:
NEWS: Mention Rose Tatto save dialog crash fix

Changed paths:
    NEWS.md


diff --git a/NEWS.md b/NEWS.md
index e5ae07d6f3..a8083dabb7 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -43,6 +43,7 @@ For a more comprehensive changelog of the latest experimental code, see:
    - Fix fog overlay at Cleopatra's Needle in Rose Tattoo.
    - Fix graphic issues in Serrated Scalpel looking at items whilst inventory is open.
    - Make Serrated Scalpel darts closer in speed to the original.
+   - Fix crash when moving cursor past end of string in Rose Tattoo save dialog.
 
  TwinE:
    - Numerous bugfixes and stability improvements.