Add a safety net to set range span in the spell checker (37e169cd) · Commits · e / os / android_frameworks_base

core/java/android/widget/SpellChecker.java

+12 −2

Original line number	Original line	Diff line number	Diff line
	@@ -473,8 +473,16 @@ public class SpellChecker implements SpellCheckerSessionListener {
	private Object mRange = new Object();		private Object mRange = new Object();

	public void parse(int start, int end) {		public void parse(int start, int end) {
	if (end > start) {		final int max = mTextView.length();
	setRangeSpan((Editable) mTextView.getText(), start, end);		final int parseEnd;
			if (end > max) {
			Log.w(TAG, "Parse invalid region, from " + start + " to " + end);
			parseEnd = max;
			} else {
			parseEnd = end;
			}
			if (parseEnd > start) {
			setRangeSpan((Editable) mTextView.getText(), start, parseEnd);
	parse();		parse();
	}		}
	}		}
	@@ -612,6 +620,8 @@ public class SpellChecker implements SpellCheckerSessionListener {
	break;		break;
	}		}
	if (spellCheckEnd <= spellCheckStart) {		if (spellCheckEnd <= spellCheckStart) {
			Log.w(TAG, "Trying to spellcheck invalid region, from "
			+ start + " to " + end);
	break;		break;
	}		}
	if (createSpellCheckSpan) {		if (createSpellCheckSpan) {