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

coverity#1418672 silence Explicit null deref

Change-Id: I9c39da02a344316b09c190a3c12bdb17201cf176
Reviewed-on: https://gerrit.libreoffice.org/43027Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst da6f7f19
...@@ -89,6 +89,7 @@ void StgIo::SetupStreams() ...@@ -89,6 +89,7 @@ void StgIo::SetupStreams()
m_pDataStrm = nullptr; m_pDataStrm = nullptr;
m_pFAT = nullptr; m_pFAT = nullptr;
ResetError(); ResetError();
short nPhysPageSize = 1 << m_aHdr.GetPageSize(); short nPhysPageSize = 1 << m_aHdr.GetPageSize();
SetPhysPageSize(nPhysPageSize); SetPhysPageSize(nPhysPageSize);
sal_Int32 nFatStrmSize; sal_Int32 nFatStrmSize;
...@@ -98,12 +99,11 @@ void StgIo::SetupStreams() ...@@ -98,12 +99,11 @@ void StgIo::SetupStreams()
SetError(SVSTREAM_FILEFORMAT_ERROR); SetError(SVSTREAM_FILEFORMAT_ERROR);
m_pFAT = nullptr; m_pFAT = nullptr;
m_pTOC = nullptr; m_pTOC = nullptr;
return;
} }
else
{ m_pFAT = new StgFATStrm(*this, nFatStrmSize);
m_pFAT = new StgFATStrm(*this, nFatStrmSize); m_pTOC = new StgDirStrm(*this);
m_pTOC = new StgDirStrm( *this );
}
if( !GetError() ) if( !GetError() )
{ {
StgDirEntry* pRoot = m_pTOC->GetRoot(); StgDirEntry* pRoot = m_pTOC->GetRoot();
......
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