mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

set deleted pointers to nsnull. just to be safe. r=hyatt

This commit is contained in:
sspitzer%netscape.com 1999-07-01 07:12:46 +00:00
Родитель 737bc85937
Коммит b524c35438
2 изменённых файлов: 28 добавлений и 10 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

17
layout/html/table/src/nsTableFrame.cpp
Просмотреть файл

@ -320,17 +320,25 @@ nsTableFrame::Init(nsIPresContext& aPresContext,
nsTableFrame::~nsTableFrame() nsTableFrame::~nsTableFrame()
{ {
if (nsnull!=mCellMap) if (nsnull!=mCellMap) {
delete mCellMap; delete mCellMap;
mCellMap = nsnull;
}
if (nsnull!=mColumnWidths) if (nsnull!=mColumnWidths) {
delete [] mColumnWidths; delete [] mColumnWidths;
mColumnWidths = nsnull;
}
if (nsnull!=mTableLayoutStrategy) if (nsnull!=mTableLayoutStrategy) {
delete mTableLayoutStrategy; delete mTableLayoutStrategy;
mTableLayoutStrategy = nsnull;
}
if (nsnull!=mColCache) if (nsnull!=mColCache) {
delete mColCache; delete mColCache;
mColCache = nsnull;
}
} }
NS_IMETHODIMP NS_IMETHODIMP
@ -4615,6 +4623,7 @@ void nsTableFrame::BuildColumnCache( nsIPresContext& aPresContext,
if (PR_TRUE==gsDebugIR) printf("TIF BCC: clearing column cache and cell map column frame cache.\n"); if (PR_TRUE==gsDebugIR) printf("TIF BCC: clearing column cache and cell map column frame cache.\n");
mCellMap->ClearColumnCache(); mCellMap->ClearColumnCache();
delete mColCache; delete mColCache;
mColCache = nsnull;
} }
mColCache = new ColumnInfoCache(GetColCount()); mColCache = new ColumnInfoCache(GetColCount());

17
layout/tables/nsTableFrame.cpp
Просмотреть файл

@ -320,17 +320,25 @@ nsTableFrame::Init(nsIPresContext& aPresContext,
nsTableFrame::~nsTableFrame() nsTableFrame::~nsTableFrame()
{ {
if (nsnull!=mCellMap) if (nsnull!=mCellMap) {
delete mCellMap; delete mCellMap;
mCellMap = nsnull;
}
if (nsnull!=mColumnWidths) if (nsnull!=mColumnWidths) {
delete [] mColumnWidths; delete [] mColumnWidths;
mColumnWidths = nsnull;
}
if (nsnull!=mTableLayoutStrategy) if (nsnull!=mTableLayoutStrategy) {
delete mTableLayoutStrategy; delete mTableLayoutStrategy;
mTableLayoutStrategy = nsnull;
}
if (nsnull!=mColCache) if (nsnull!=mColCache) {
delete mColCache; delete mColCache;
mColCache = nsnull;
}
} }
NS_IMETHODIMP NS_IMETHODIMP
@ -4615,6 +4623,7 @@ void nsTableFrame::BuildColumnCache( nsIPresContext& aPresContext,
if (PR_TRUE==gsDebugIR) printf("TIF BCC: clearing column cache and cell map column frame cache.\n"); if (PR_TRUE==gsDebugIR) printf("TIF BCC: clearing column cache and cell map column frame cache.\n");
mCellMap->ClearColumnCache(); mCellMap->ClearColumnCache();
delete mColCache; delete mColCache;
mColCache = nsnull;
} }
mColCache = new ColumnInfoCache(GetColCount()); mColCache = new ColumnInfoCache(GetColCount());