Bug 582553 - nsSelectionState::IsEqual ignores error return from CompareBoundaryPoints; r,a=roc

This commit is contained in:
Ehsan Akhgari 2010-08-05 22:13:07 -04:00
Родитель 0b1cce6744
Коммит c3c89c0ab8
1 изменённых файлов: 5 добавлений и 4 удалений

Просмотреть файл

@ -161,10 +161,11 @@ nsSelectionState::IsEqual(nsSelectionState *aSelState)
NS_ENSURE_TRUE(myRange && itsRange, PR_FALSE); NS_ENSURE_TRUE(myRange && itsRange, PR_FALSE);
PRInt16 compResult; PRInt16 compResult;
myRange->CompareBoundaryPoints(nsIDOMRange::START_TO_START, itsRange, &compResult); nsresult rv;
if (compResult) return PR_FALSE; rv = myRange->CompareBoundaryPoints(nsIDOMRange::START_TO_START, itsRange, &compResult);
myRange->CompareBoundaryPoints(nsIDOMRange::END_TO_END, itsRange, &compResult); if (NS_FAILED(rv) || compResult) return PR_FALSE;
if (compResult) return PR_FALSE; rv = myRange->CompareBoundaryPoints(nsIDOMRange::END_TO_END, itsRange, &compResult);
if (NS_FAILED(rv) || compResult) return PR_FALSE;
} }
// if we got here, they are equal // if we got here, they are equal
return PR_TRUE; return PR_TRUE;