Removed char &operator [] from class String -- it had the potential to wreak havoc when used on shared strings (thanks to tramboi for pointing this out)

svn-id: r31334

4 files changed, 36 insertions, 26 deletions

diff --git a/common/file.cpp b/common/file.cpp
index ccfeb5f322..7fe2e1b655 100644
--- a/common/file.cpp
+++ b/common/file.cpp
@@ -146,54 +146,53 @@ static StringMap *_filesMap;
 
 static FILE *fopenNoCase(const String &filename, const String &directory, const char *mode) {
 	FILE *file;
-	String buf(directory);
-	uint i;
+	String dirBuf(directory);
+	String fileBuf(filename);
 
 #if !defined(__GP32__) && !defined(PALMOS_MODE)
 	// Add a trailing slash, if necessary.
-	if (!buf.empty()) {
-		const char c = buf.lastChar();
+	if (!dirBuf.empty()) {
+		const char c = dirBuf.lastChar();
 		if (c != ':' && c != '/' && c != '\\')
-			buf += '/';
+			dirBuf += '/';
 	}
 #endif
 
 	// Append the filename to the path string
-	const int offsetToFileName = buf.size();
-	buf += filename;
+	String pathBuf(dirBuf);
+	pathBuf += fileBuf;
 
 	//
 	// Try to open the file normally
 	//
-	file = fopen(buf.c_str(), mode);
+	file = fopen(pathBuf.c_str(), mode);
 
 	//
 	// Try again, with file name converted to upper case
 	//
 	if (!file) {
-		for (i = offsetToFileName; i < buf.size(); ++i) {
-			buf[i] = toupper(buf[i]);
-		}
-		file = fopen(buf.c_str(), mode);
+		fileBuf.toUppercase();
+		pathBuf += fileBuf;
+		file = fopen(pathBuf.c_str(), mode);
 	}
 
 	//
 	// Try again, with file name converted to lower case
 	//
 	if (!file) {
-		for (i = offsetToFileName; i < buf.size(); ++i) {
-			buf[i] = tolower(buf[i]);
-		}
-		file = fopen(buf.c_str(), mode);
+		fileBuf.toLowercase();
+		pathBuf += fileBuf;
+		file = fopen(pathBuf.c_str(), mode);
 	}
 
 	//
 	// Try again, with file name capitalized
 	//
 	if (!file) {
-		i = offsetToFileName;
-		buf[i] = toupper(buf[i]);
-		file = fopen(buf.c_str(), mode);
+		fileBuf.toLowercase();
+		fileBuf.setChar(toupper(fileBuf[0]),0);
+		pathBuf += fileBuf;
+		file = fopen(pathBuf.c_str(), mode);
 	}
 
 #ifdef __amigaos4__
diff --git a/common/str.cpp b/common/str.cpp
index 9e94d240d7..ad48ef6087 100644
--- a/common/str.cpp
+++ b/common/str.cpp
@@ -254,6 +254,13 @@ void String::clear() {
 	_storage[0] = 0;
 }
 
+void String::setChar(char c, uint32 p) {
+	assert(p <= _len);
+
+	ensureCapacity(_len, true);
+	_str[p] = c;
+}
+
 void String::insertChar(char c, uint32 p) {
 	assert(p <= _len);
 
diff --git a/common/str.h b/common/str.h
index e85213b561..a92ec34fff 100644
--- a/common/str.h
+++ b/common/str.h
@@ -146,16 +146,20 @@ public:
 		return _str[idx];
 	}
 
-	char &operator [](int idx) {
-		assert(_str && idx >= 0 && idx < (int)_len);
-		return _str[idx];
-	}
-
+	/** Remove the last character from the string. */
 	void deleteLastChar();
+	
+	/** Remove the character at position p from the string. */
 	void deleteChar(uint32 p);
-	void clear();
+
+	/** Set character c at position p, replacing the previous character there. */
+	void setChar(char c, uint32 p);
+
+	/** Set character c at position p. */
 	void insertChar(char c, uint32 p);
 
+	void clear();
+
 	void toLowercase();
 	void toUppercase();
 
diff --git a/engines/agi/predictive.cpp b/engines/agi/predictive.cpp
index a670146b7e..0eb0b2e032 100644
--- a/engines/agi/predictive.cpp
+++ b/engines/agi/predictive.cpp
@@ -430,7 +430,7 @@ bool AgiEngine::predictiveDialog(void) {
 							else
 								repeatcount[x - 1] = (repeatcount[x - 1] + 1) % 3;
 							if (_currentCode.lastChar() >= '1')
-								_currentWord[x - 1] = buttons[_currentCode[x - 1] - '1'][3 + repeatcount[x - 1]];
+								_currentWord.setChar(buttons[_currentCode[x - 1] - '1'][3 + repeatcount[x - 1]], x-1);
 						}
 					}
 				} else if (active == 10) { // add