From b79ecc8bc9f0b5de0eee0b4fc79e4e152fb17006 Mon Sep 17 00:00:00 2001
From: DINH Viet Hoa <hoa@sprw.me>
Date: Tue, 29 Jan 2013 00:01:22 -0800
Subject: fixed crash in String::replaceOccurrencesOfString()

---
 src/core/basetypes/MCString.cc | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'src/core/basetypes')

diff --git a/src/core/basetypes/MCString.cc b/src/core/basetypes/MCString.cc
index a5607475..c371a88b 100644
--- a/src/core/basetypes/MCString.cc
+++ b/src/core/basetypes/MCString.cc
@@ -1206,7 +1206,7 @@ unsigned int String::replaceOccurrencesOfString(String * occurrence, String * re
     int delta = replacement->length() - occurrence->length();
     int modifiedLength = mLength + delta * count + 1;
     unicodeChars = (UChar *) malloc(modifiedLength * sizeof(* unicodeChars));
-    unicodeChars[modifiedLength] = 0;
+    unicodeChars[modifiedLength - 1] = 0;
     UChar * dest_p = unicodeChars;
     p = mUnicodeChars;
     while (1) {
@@ -1979,8 +1979,7 @@ String * String::uniquedStringWithUTF8Characters(const char * UTF8Characters)
 
 String * String::htmlEncodedString()
 {
-    String * htmlStr;
-    htmlStr = String::string();
+    String * htmlStr = String::string();
 #define kBufSz 2000
     
     const char * inStr = UTF8Characters();
-- 
cgit v1.2.3