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

Resolves: ofz#820 an exception is an acceptable outcome

Browse Source 
Change-Id: Ifc5be483387202c371596fd52f1e2ce682151ca8
This commit is contained in:
Caolán McNamara 2017-03-20 15:51:38 +00:00
parent d31cdf523c
commit 2ee7ad0151
2 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
hwpfilter/source/hwpreader.cxx
View File

@ -118,21 +118,28 @@ HwpReader::~HwpReader()
extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportHWP(SvStream &rStream)
{
std::unique_ptr<HStream> stream(new HStream);
byte aData[32768];
std::size_t nRead, nBlock = 32768;
while (true)
try
{
nRead = rStream.ReadBytes(aData, nBlock);
if (nRead == 0)
break;
stream->addData(aData, (int)nRead);
}
std::unique_ptr<HStream> stream(new HStream);
byte aData[32768];
std::size_t nRead, nBlock = 32768;
HWPFile hwpfile;
if (hwpfile.ReadHwpFile(stream.release()))
return false;
while (true)
{
nRead = rStream.ReadBytes(aData, nBlock);
if (nRead == 0)
break;
stream->addData(aData, (int)nRead);
}
HWPFile hwpfile;
if (hwpfile.ReadHwpFile(stream.release()))
return false;
}
catch (...)
{
return false;
}
return true;
}

3
lotuswordpro/source/filter/lwpfilter.cxx
View File

@ -215,13 +215,12 @@ int ReadWordproFile(SvStream &rStream, uno::Reference<css::xml::sax::XDocumentHa
//Reset all static objects,because this function may be called many times.
XFGlobalReset();
reader.Read();
return 0;
}
catch (...)
{
return 1;
}
return 0;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */