[Libreoffice-commits] core.git: writerperfect/source

[Caolán McNamara]

 writerperfect/source/common/WPXSvInputStream.cxx |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 83991055eed93bb0ad96e3690062798a57df6c74
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Aug 19 08:59:35 2014 +0100

    can actually manage to ask createStream for missing streams
    
    writerperfect::(anonymous namespace)::OLEStorageImpl::createStream(rtl::OUString const&) (WPXSvInputStream.cxx:260)
    writerperfect::WPXSvInputStreamImpl::getSubStreamByName(char const*) (WPXSvInputStream.cxx:201)
    MWAWInputStream::unzipStream()
    MWAWInputStream::MWAWInputStream
    
    valgrind + bff
    
    Change-Id: Iaecb8b7f05ed4369ddd37b34166dc3c3388ffb4d

diff --git a/writerperfect/source/common/WPXSvInputStream.cxx b/writerperfect/source/common/WPXSvInputStream.cxx
index 264dcc8..1f8d575 100644
--- a/writerperfect/source/common/WPXSvInputStream.cxx
+++ b/writerperfect/source/common/WPXSvInputStream.cxx
@@ -253,9 +253,8 @@ SotStorageStreamRef OLEStorageImpl::createStream(const rtl::OUString &rPath)
 
     const OLEStorageMap_t::const_iterator aIt = maStorageMap.find(aDir);
 
-    // We can only get there for paths that are present in the OLE.
-    // Which means the storage must exist.
-    assert(maStorageMap.end() != aIt);
+    if (maStorageMap.end() == aIt)
+        return 0;
 
     return aIt->second.ref->OpenSotStream(aName, STREAM_STD_READ);
 }