Kaydet (Commit) 1aff042d authored tarafından Caolán McNamara's avatar Caolán McNamara

guard against missing range

Change-Id: Icdb0694b9c1771a475368aeeb4cb11f4ba8b84f3
üst 6093ba60
...@@ -1122,10 +1122,17 @@ void LwpTableLayout::PutCellVals(LwpFoundry* pFoundry, LwpObjectID aTableID) ...@@ -1122,10 +1122,17 @@ void LwpTableLayout::PutCellVals(LwpFoundry* pFoundry, LwpObjectID aTableID)
pTableRange = pTableRange->GetNext(); pTableRange = pTableRange->GetNext();
} }
if (pTableRange) if (!pTableRange)
{ return;
LwpCellRange* pRange = static_cast<LwpCellRange*>(pTableRange->GetCellRangeID().obj().get()); LwpCellRange* pRange = static_cast<LwpCellRange*>(pTableRange->GetCellRangeID().obj().get());
if (!pRange)
return;
LwpFolder* pFolder = static_cast<LwpFolder*>(pRange->GetFolderID().obj().get()); LwpFolder* pFolder = static_cast<LwpFolder*>(pRange->GetFolderID().obj().get());
if (!pFolder)
return;
LwpObjectID aRowListID = pFolder->GetChildHeadID(); LwpObjectID aRowListID = pFolder->GetChildHeadID();
LwpRowList* pRowList = static_cast<LwpRowList*>(aRowListID.obj().get()); LwpRowList* pRowList = static_cast<LwpRowList*>(aRowListID.obj().get());
...@@ -1160,7 +1167,6 @@ void LwpTableLayout::PutCellVals(LwpFoundry* pFoundry, LwpObjectID aTableID) ...@@ -1160,7 +1167,6 @@ void LwpTableLayout::PutCellVals(LwpFoundry* pFoundry, LwpObjectID aTableID)
} }
pRowList = static_cast<LwpRowList*>(pRowList->GetNextID().obj().get()); pRowList = static_cast<LwpRowList*>(pRowList->GetNextID().obj().get());
} }
}
}catch (...) { }catch (...) {
assert(false); assert(false);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment