Merge pull request cocos2d#2907 from waiter/master

fixed cocos2d#2306: update “solve android crash with CCLabelTTF setString function”
angeltown · Jun 19, 2013 · 92a0ab1 · 92a0ab1
2 parents 8476447 + cff29b5
commit 92a0ab1
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/cocos2dx/platform/android/java/src/org/cocos2dx/lib/Cocos2dxBitmap.java b/cocos2dx/platform/android/java/src/org/cocos2dx/lib/Cocos2dxBitmap.java
@@ -390,7 +390,7 @@ private static LinkedList<String> divideStringWithMaxWidth(
 				}
 
 				/* Remove spaces at the beginning of a new line. */
-				while (pString.charAt(i) == ' ') {
+				while (i < charLength && pString.charAt(i) == ' ') {
 					++i;
 				}