[Scummvm-cvs-logs] scummvm master -> 139ad46410fe0a92a83eabd662caf2165eb498da

Tkachov Tkachov at users.noreply.github.com
Sat Aug 6 11:23:02 CEST 2016


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
139ad46410 WAGE: Fix crash in Explorer


Commit: 139ad46410fe0a92a83eabd662caf2165eb498da
    https://github.com/scummvm/scummvm/commit/139ad46410fe0a92a83eabd662caf2165eb498da
Author: Alexander Tkachev (alexander at tkachov.ru)
Date: 2016-08-06T16:20:44+06:00

Commit Message:
WAGE: Fix crash in Explorer

Caused by operator[] usage on empty string.

Changed paths:
    graphics/macgui/macmenu.cpp



diff --git a/graphics/macgui/macmenu.cpp b/graphics/macgui/macmenu.cpp
index 6169b3e..a78fa2e 100644
--- a/graphics/macgui/macmenu.cpp
+++ b/graphics/macgui/macmenu.cpp
@@ -249,7 +249,7 @@ void Menu::createSubMenuFromString(int id, const char *str) {
 
 			Common::String tmpitem(item);
 			tmpitem.trim();
-			if (tmpitem[0] == '(') {
+			if (tmpitem.size() > 0 && tmpitem[0] == '(') {
 				enabled = false;
 
 				for (uint j = 0; j < item.size(); j++)






More information about the Scummvm-git-logs mailing list