Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 19:35:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix bug 71274. r=nhotta sr=jst

Browse Source 
remove bad code which may cause crash
work around the condition which will case IME crash on Mac when Mac cabonalized MSL does not comfirm to
ISO C++ standard and return null when ask for new xxx[0];
This commit is contained in:
ftang%netscape.com 2001-03-12 22:26:58 +00:00
parent 9942064481
commit 28e5f652ee
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
content/events/src/nsDOMEvent.cpp
View File

@ -184,9 +184,13 @@ nsDOMEvent::nsDOMEvent(nsIPresContext* aPresContext, nsEvent* aEvent, const nsAR
}
}
mTextRange = (nsIPrivateTextRangeList*) new nsPrivateTextRangeList(((nsTextEvent*)aEvent)->rangeCount,tempTextRangeList);
if (mTextRange!=nsnull) mTextRange->AddRef();
}
// We need to create mTextRange even rangeCount is 0.
// if rangeCount is 0, mac carbon will return 0 for new and tempTextRangeList will be null. but we should still
// create mTextRange, otherwise, we will crash it later when some code call GetInputRange and AddRef to the result
mTextRange = (nsIPrivateTextRangeList*) new nsPrivateTextRangeList(((nsTextEvent*)aEvent)->rangeCount,tempTextRangeList);
if (mTextRange!=nsnull)
mTextRange->AddRef();
}
NS_INIT_REFCNT();

14
content/events/src/nsPrivateTextRange.cpp
View File

@ -74,12 +74,14 @@ NS_METHOD nsPrivateTextRange::SetRangeType(PRUint16 aRangeType)
}
nsPrivateTextRangeList::nsPrivateTextRangeList(PRUint16 aLength,nsIPrivateTextRange** aList)
: mLength(aLength),
mList(aList)
nsPrivateTextRangeList::nsPrivateTextRangeList(PRUint16 aLength,
nsIPrivateTextRange** aList)
: mLength(aLength), mList(aList)
{
if (aList==nsnull)
aLength = 0;
if(! aList) {
NS_WARN_IF_FALSE(!aLength, "Geez, this deosn't make sense");
mLength = 0;
}
NS_INIT_REFCNT();
}
@ -105,7 +107,7 @@ NS_METHOD nsPrivateTextRangeList::GetLength(PRUint16* aLength)
NS_METHOD nsPrivateTextRangeList::Item(PRUint16 aIndex, nsIPrivateTextRange** aReturn)
{
if (aIndex>mLength) {
if (aIndex>=mLength) {
*aReturn = nsnull;
return NS_ERROR_FAILURE;
}