aboutsummaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
authorEugene Sandulenko2017-08-15 19:49:15 +0200
committerEugene Sandulenko2017-08-15 19:49:15 +0200
commitb9a7f2c8004073871a698385fcf364639df02919 (patch)
treef9d2c618820e827be3a916c17eb9346c8e7948f2 /graphics
parent0f0dd88b6129151595d58541ba6f35ce7db8922c (diff)
downloadscummvm-rg350-b9a7f2c8004073871a698385fcf364639df02919.tar.gz
scummvm-rg350-b9a7f2c8004073871a698385fcf364639df02919.tar.bz2
scummvm-rg350-b9a7f2c8004073871a698385fcf364639df02919.zip
GRAPHICS: MACGUI: Fix crash in selection when there is no text found
Diffstat (limited to 'graphics')
-rw-r--r--graphics/macgui/mactextwindow.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/graphics/macgui/mactextwindow.cpp b/graphics/macgui/mactextwindow.cpp
index a45d1d641b..9a1898b044 100644
--- a/graphics/macgui/mactextwindow.cpp
+++ b/graphics/macgui/mactextwindow.cpp
@@ -257,9 +257,12 @@ Common::String MacTextWindow::cutSelection() {
const char *selStart = strstr(_inputText.c_str(), selection.c_str());
- if (!selStart)
+ if (!selStart) {
warning("Cannot find substring '%s' in '%s'", selection.c_str(), _inputText.c_str());
+ return Common::String("");
+ }
+
int selPos = selStart - _inputText.c_str();
_inputText = Common::String(_inputText.c_str(), selPos) + Common::String(_inputText.c_str() + selPos + selection.size());