lotuswordpro/source/filter/lwpfilter.cxx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
New commits: commit 19561b0a54d0753db860e3b06b7b2ebba45a801c Author: Caolán McNamara <[email protected]> Date: Wed Mar 1 14:11:47 2017 +0000 ofz: oom on seeks past end of SvMemoryStream cause it grows to fit if its a resizable stream Change-Id: I28b42becdfc8eb591d19d2512cdc1f1ec32c3bbe (cherry picked from commit a42d9c5b541d637dcf24086e30f341b30e03c4c7) Reviewed-on: https://gerrit.libreoffice.org/34754 Tested-by: Jenkins <[email protected]> Reviewed-by: Michael Stahl <[email protected]> diff --git a/lotuswordpro/source/filter/lwpfilter.cxx b/lotuswordpro/source/filter/lwpfilter.cxx index 05c8159..b6af0fd 100644 --- a/lotuswordpro/source/filter/lwpfilter.cxx +++ b/lotuswordpro/source/filter/lwpfilter.cxx @@ -104,7 +104,7 @@ using namespace OpenStormBento; bool Decompress(SvStream *pCompressed, SvStream * & pOutDecompressed) { pCompressed->Seek(0); - std::unique_ptr<SvStream> aDecompressed(new SvMemoryStream(4096, 4096)); + std::unique_ptr<SvMemoryStream> aDecompressed(new SvMemoryStream(4096, 4096)); unsigned char buffer[512]; pCompressed->Read(buffer, 16); aDecompressed->Write(buffer, 16); @@ -132,6 +132,9 @@ using namespace OpenStormBento; while (sal_uInt32 iRead = pCompressed->Read(buffer, 512)) aDecompressed->Write(buffer, iRead); + // disable stream growing past its current size + aDecompressed->SetResizeOffset(0); + //transfer ownership of aDecompressed's ptr pOutDecompressed = aDecompressed.release(); return true;
_______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
