forcepoint #5 null deref
Change-Id: I95b67f98b7028d7ca7c4a9d1c15100e42d359816 Reviewed-on: https://gerrit.libreoffice.org/50241 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
This commit is contained in:
@@ -1484,9 +1484,14 @@ XMLImpSpanContext_Impl::XMLImpSpanContext_Impl(
|
||||
|
||||
XMLImpSpanContext_Impl::~XMLImpSpanContext_Impl()
|
||||
{
|
||||
if( pHint )
|
||||
pHint->SetEnd( GetImport().GetTextImport()
|
||||
->GetCursorAsRange()->getStart() );
|
||||
if (!pHint)
|
||||
return;
|
||||
|
||||
Reference<XTextRange> xCrsrRange(GetImport().GetTextImport()->GetCursorAsRange());
|
||||
if (!xCrsrRange.is())
|
||||
return; // Robust (defective file)
|
||||
|
||||
pHint->SetEnd(xCrsrRange->getStart());
|
||||
}
|
||||
|
||||
SvXMLImportContextRef XMLImpSpanContext_Impl::CreateChildContext(
|
||||
@@ -1881,7 +1886,7 @@ void XMLParaContext::EndElement()
|
||||
GetImport().GetTextImport());
|
||||
Reference < XTextRange > xCrsrRange( xTxtImport->GetCursorAsRange() );
|
||||
if( !xCrsrRange.is() )
|
||||
return; // Robust (defect file)
|
||||
return; // Robust (defective file)
|
||||
Reference < XTextRange > xEnd(xCrsrRange->getStart());
|
||||
|
||||
// if we have an id set for this paragraph, get a cursor for this
|
||||
@@ -1907,7 +1912,7 @@ void XMLParaContext::EndElement()
|
||||
try {
|
||||
xAttrCursor = xTxtImport->GetText()->createTextCursorByRange( xStart );
|
||||
if( !xAttrCursor.is() )
|
||||
return; // Robust (defect file)
|
||||
return; // Robust (defective file)
|
||||
} catch (const uno::Exception &) {
|
||||
// createTextCursorByRange() likes to throw runtime exception, even
|
||||
// though it just means 'we were unable to create the cursor'
|
||||
|
Reference in New Issue
Block a user