Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-12 21:05:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bug 85487, M091 crash at line breaker [@ nsJISx4501LineBreaker::Next],

Browse Source 
r=ftang, sr=waterson, a=asa
This commit is contained in:
loadrunner%betak.net 2001-06-19 22:57:50 +00:00
parent 0793323929
commit 91c70ee453
2 changed files with 46 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
layout/generic/nsTextFrame.cpp
View File

@ -5301,20 +5301,30 @@ nsTextFrame::ComputeTotalWordWidth(nsIPresContext* aPresContext,
newWordBufSize += moreSize;
if (newWordBuf != aWordBuf) {
newWordBuf = (PRUnichar*)nsMemory::Realloc(newWordBuf, sizeof(PRUnichar)*newWordBufSize);
NS_ASSERTION(newWordBuf, "not enough memory");
} else {
newWordBuf = (PRUnichar*)nsMemory::Alloc(sizeof(PRUnichar)*newWordBufSize);
nsCRT::memcpy((void*)newWordBuf, aWordBuf, sizeof(PRUnichar)*newWordBufSize-moreSize);
NS_ASSERTION(newWordBuf, "not enough memory");
if(newWordBuf) {
nsCRT::memcpy((void*)newWordBuf, aWordBuf, sizeof(PRUnichar)*(newWordBufSize-moreSize));
}
}
moreWidth = ComputeWordFragmentWidth(aPresContext,
aLineBreaker,
aLineLayout,
aReflowState,
aNextFrame, content, tc,
&stop,
newWordBuf,
aWordLen,
newWordBufSize);
NS_ASSERTION((moreWidth >= 0), "ComputeWordFragmentWidth is returning negative");
if(newWordBuf) {
moreWidth = ComputeWordFragmentWidth(aPresContext,
aLineBreaker,
aLineLayout,
aReflowState,
aNextFrame, content, tc,
&stop,
newWordBuf,
aWordLen,
newWordBufSize);
NS_ASSERTION((moreWidth >= 0), "ComputeWordFragmentWidth is returning negative");
} else {
stop = PR_TRUE;
moreWidth = 0;
}
}
NS_RELEASE(tc);
@ -5345,8 +5355,9 @@ nsTextFrame::ComputeTotalWordWidth(nsIPresContext* aPresContext,
#ifdef DEBUG_WORD_WRAPPING
printf(" total word width=%d\n", aBaseWidth + addedWidth);
#endif
if (newWordBuf != aWordBuf)
if (newWordBuf && (newWordBuf != aWordBuf)) {
nsMemory::Free(newWordBuf);
}
return aBaseWidth + addedWidth;
}

35
layout/html/base/src/nsTextFrame.cpp
View File

@ -5301,20 +5301,30 @@ nsTextFrame::ComputeTotalWordWidth(nsIPresContext* aPresContext,
newWordBufSize += moreSize;
if (newWordBuf != aWordBuf) {
newWordBuf = (PRUnichar*)nsMemory::Realloc(newWordBuf, sizeof(PRUnichar)*newWordBufSize);
NS_ASSERTION(newWordBuf, "not enough memory");
} else {
newWordBuf = (PRUnichar*)nsMemory::Alloc(sizeof(PRUnichar)*newWordBufSize);
nsCRT::memcpy((void*)newWordBuf, aWordBuf, sizeof(PRUnichar)*newWordBufSize-moreSize);
NS_ASSERTION(newWordBuf, "not enough memory");
if(newWordBuf) {
nsCRT::memcpy((void*)newWordBuf, aWordBuf, sizeof(PRUnichar)*(newWordBufSize-moreSize));
}
}
moreWidth = ComputeWordFragmentWidth(aPresContext,
aLineBreaker,
aLineLayout,
aReflowState,
aNextFrame, content, tc,
&stop,
newWordBuf,
aWordLen,
newWordBufSize);
NS_ASSERTION((moreWidth >= 0), "ComputeWordFragmentWidth is returning negative");
if(newWordBuf) {
moreWidth = ComputeWordFragmentWidth(aPresContext,
aLineBreaker,
aLineLayout,
aReflowState,
aNextFrame, content, tc,
&stop,
newWordBuf,
aWordLen,
newWordBufSize);
NS_ASSERTION((moreWidth >= 0), "ComputeWordFragmentWidth is returning negative");
} else {
stop = PR_TRUE;
moreWidth = 0;
}
}
NS_RELEASE(tc);
@ -5345,8 +5355,9 @@ nsTextFrame::ComputeTotalWordWidth(nsIPresContext* aPresContext,
#ifdef DEBUG_WORD_WRAPPING
printf(" total word width=%d\n", aBaseWidth + addedWidth);
#endif
if (newWordBuf != aWordBuf)
if (newWordBuf && (newWordBuf != aWordBuf)) {
nsMemory::Free(newWordBuf);
}
return aBaseWidth + addedWidth;
}