From 03a35a3f0aaca4c5e49552ee741d34d376522606 Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Wed, 24 Aug 2016 12:42:40 +0300 Subject: [PATCH] forgot to check length() --- .../openapi/diff/impl/string/DiffString.java | 16 ---------------- .../util/text/CharArrayCharSequence.java | 2 +- 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/platform/util/src/com/intellij/openapi/diff/impl/string/DiffString.java b/platform/util/src/com/intellij/openapi/diff/impl/string/DiffString.java index 9906803a882c..8a42bb7414da 100644 --- a/platform/util/src/com/intellij/openapi/diff/impl/string/DiffString.java +++ b/platform/util/src/com/intellij/openapi/diff/impl/string/DiffString.java @@ -93,22 +93,6 @@ public class DiffString extends CharArrayCharSequence { System.arraycopy(myChars, myStart, dst, start, length()); } - @Override - public boolean equals(@Nullable Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; - - DiffString that = (DiffString)o; - - if (length() != that.length()) return false; - if (hashCode() != that.hashCode()) return false; - for (int i = 0; i < length(); i++) { - if (data(i) != that.data(i)) return false; - } - - return true; - } - @Nullable public static DiffString concatenateNullable(@Nullable DiffString s1, @Nullable DiffString s2) { if (s1 == null || s2 == null) { diff --git a/platform/util/src/com/intellij/util/text/CharArrayCharSequence.java b/platform/util/src/com/intellij/util/text/CharArrayCharSequence.java index fbb840685302..71824102c7bb 100644 --- a/platform/util/src/com/intellij/util/text/CharArrayCharSequence.java +++ b/platform/util/src/com/intellij/util/text/CharArrayCharSequence.java @@ -78,7 +78,7 @@ public class CharArrayCharSequence implements CharSequenceBackedByArray, CharSeq if (this == anObject) { return true; } - if (anObject == null || getClass() != anObject.getClass()) { + if (anObject == null || getClass() != anObject.getClass() || length() != ((CharSequence)anObject).length()) { return false; } return CharArrayUtil.regionMatches(myChars, myStart, myEnd, (CharSequence)anObject);