mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

forcepoint #5 null deref

Browse Source 
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:
Caolán McNamara
2018-02-23 13:08:16 +00:00
parent 36bd5662e7
commit c156c9faff
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
xmloff/source/text/txtparai.cxx
View File

@@ -1484,9 +1484,14 @@ XMLImpSpanContext_Impl::XMLImpSpanContext_Impl(
XMLImpSpanContext_Impl::~XMLImpSpanContext_Impl() XMLImpSpanContext_Impl::~XMLImpSpanContext_Impl()
{ {
if( pHint ) if (!pHint)
pHint->SetEnd( GetImport().GetTextImport() return;
->GetCursorAsRange()->getStart() );
Reference<XTextRange> xCrsrRange(GetImport().GetTextImport()->GetCursorAsRange());
if (!xCrsrRange.is())
return; // Robust (defective file)
pHint->SetEnd(xCrsrRange->getStart());
} }
SvXMLImportContextRef XMLImpSpanContext_Impl::CreateChildContext( SvXMLImportContextRef XMLImpSpanContext_Impl::CreateChildContext(
@@ -1881,7 +1886,7 @@ void XMLParaContext::EndElement()
GetImport().GetTextImport()); GetImport().GetTextImport());
Reference < XTextRange > xCrsrRange( xTxtImport->GetCursorAsRange() ); Reference < XTextRange > xCrsrRange( xTxtImport->GetCursorAsRange() );
if( !xCrsrRange.is() ) if( !xCrsrRange.is() )
return; // Robust (defect file) return; // Robust (defective file)
Reference < XTextRange > xEnd(xCrsrRange->getStart()); Reference < XTextRange > xEnd(xCrsrRange->getStart());
// if we have an id set for this paragraph, get a cursor for this // if we have an id set for this paragraph, get a cursor for this
@@ -1907,7 +1912,7 @@ void XMLParaContext::EndElement()
try { try {
xAttrCursor = xTxtImport->GetText()->createTextCursorByRange( xStart ); xAttrCursor = xTxtImport->GetText()->createTextCursorByRange( xStart );
if( !xAttrCursor.is() ) if( !xAttrCursor.is() )
return; // Robust (defect file) return; // Robust (defective file)
} catch (const uno::Exception &) { } catch (const uno::Exception &) {
// createTextCursorByRange() likes to throw runtime exception, even // createTextCursorByRange() likes to throw runtime exception, even
// though it just means 'we were unable to create the cursor' // though it just means 'we were unable to create the cursor'