Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am a0364e23: Merge "Fix infinite recursion in hashcode of Spannables" into klp-dev

Browse Source 
* commit 'a0364e23601db099b02fd280f91d2d3ecc2b0cc4':
  Fix infinite recursion in hashcode of Spannables
This commit is contained in:
Chet Haase
2013-10-04 15:15:37 -07:00
committed by Android Git Automerger
parent 538df3437b a0364e2360
commit 956b23f4e3
2 changed files with 32 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
core/java/android/text/SpannableStringBuilder.java
View File

@@ -1293,23 +1293,29 @@ public class SpannableStringBuilder implements CharSequence, GetChars, Spannable
public boolean equals(Object o) {
if (o instanceof Spanned &&
toString().equals(o.toString())) {
Spanned other = (Spanned) o;
// Check span data
Object[] otherSpans = ((Spanned) o).getSpans(0,
((Spanned) o).length(), Object.class);
Object[] otherSpans = other.getSpans(0, other.length(), Object.class);
if (mSpanCount == otherSpans.length) {
for (int i = 0; i < mSpanCount; ++i) {
Object thisSpan = mSpans[i];
Object otherSpan = otherSpans[i];
if (!thisSpan.equals(otherSpan) ||
getSpanStart(thisSpan) != getSpanStart(otherSpan) ||
getSpanEnd(thisSpan) != getSpanEnd(otherSpan) ||
getSpanFlags(thisSpan) != getSpanFlags(otherSpan)) {
if (thisSpan == this) {
if (other != otherSpan ||
getSpanStart(thisSpan) != other.getSpanStart(otherSpan) ||
getSpanEnd(thisSpan) != other.getSpanEnd(otherSpan) ||
getSpanFlags(thisSpan) != other.getSpanFlags(otherSpan)) {
return false;
}
} else if (!thisSpan.equals(otherSpan) ||
getSpanStart(thisSpan) != other.getSpanStart(otherSpan) ||
getSpanEnd(thisSpan) != other.getSpanEnd(otherSpan) ||
getSpanFlags(thisSpan) != other.getSpanFlags(otherSpan)) {
return false;
}
}
return true;
}
}
return false;
}
@@ -1321,7 +1327,9 @@ public class SpannableStringBuilder implements CharSequence, GetChars, Spannable
hash = hash * 31 + mSpanCount;
for (int i = 0; i < mSpanCount; ++i) {
Object span = mSpans[i];
hash = hash * 31 + span.hashCode();
if (span != this) {
hash = hash * 31 + span.hashCode();
}
hash = hash * 31 + getSpanStart(span);
hash = hash * 31 + getSpanEnd(span);
hash = hash * 31 + getSpanFlags(span);

24
core/java/android/text/SpannableStringInternal.java
View File

@@ -363,23 +363,29 @@ import java.lang.reflect.Array;
public boolean equals(Object o) {
if (o instanceof Spanned &&
toString().equals(o.toString())) {
Spanned other = (Spanned) o;
// Check span data
Object[] otherSpans = ((Spanned) o).getSpans(0,
((Spanned) o).length(), Object.class);
Object[] otherSpans = other.getSpans(0, other.length(), Object.class);
if (mSpanCount == otherSpans.length) {
for (int i = 0; i < mSpanCount; ++i) {
Object thisSpan = mSpans[i];
Object otherSpan = otherSpans[i];
if (!thisSpan.equals(otherSpan) ||
getSpanStart(thisSpan) != getSpanStart(otherSpan) ||
getSpanEnd(thisSpan) != getSpanEnd(otherSpan) ||
getSpanFlags(thisSpan) != getSpanFlags(otherSpan)) {
if (thisSpan == this) {
if (other != otherSpan ||
getSpanStart(thisSpan) != other.getSpanStart(otherSpan) ||
getSpanEnd(thisSpan) != other.getSpanEnd(otherSpan) ||
getSpanFlags(thisSpan) != other.getSpanFlags(otherSpan)) {
return false;
}
} else if (!thisSpan.equals(otherSpan) ||
getSpanStart(thisSpan) != other.getSpanStart(otherSpan) ||
getSpanEnd(thisSpan) != other.getSpanEnd(otherSpan) ||
getSpanFlags(thisSpan) != other.getSpanFlags(otherSpan)) {
return false;
}
}
return true;
}
}
return false;
}
@@ -391,7 +397,9 @@ import java.lang.reflect.Array;
hash = hash * 31 + mSpanCount;
for (int i = 0; i < mSpanCount; ++i) {
Object span = mSpans[i];
hash = hash * 31 + span.hashCode();
if (span != this) {
hash = hash * 31 + span.hashCode();
}
hash = hash * 31 + getSpanStart(span);
hash = hash * 31 + getSpanEnd(span);
hash = hash * 31 + getSpanFlags(span);