Kaydet (Commit) c48004eb authored tarafından Caolán McNamara's avatar Caolán McNamara Kaydeden (comit) Michael Meeks

avoid hang in short pbm

Change-Id: I9b7f0832a4dc231e1e8f963858c155e3cd392667
(cherry picked from commit b8637e67)
Reviewed-on: https://gerrit.libreoffice.org/17083Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarMichael Meeks <michael.meeks@collabora.com>
üst e39e2653
...@@ -62,6 +62,10 @@ void PpmFilterTest::testCVEs() ...@@ -62,6 +62,10 @@ void PpmFilterTest::testCVEs()
testDir(OUString(), testDir(OUString(),
getURLFromSrc("/filter/qa/cppunit/data/ppm/"), getURLFromSrc("/filter/qa/cppunit/data/ppm/"),
OUString()); OUString());
testDir(OUString(),
getURLFromSrc("/filter/qa/cppunit/data/pbm/"),
OUString());
} }
CPPUNIT_TEST_SUITE_REGISTRATION(PpmFilterTest); CPPUNIT_TEST_SUITE_REGISTRATION(PpmFilterTest);
......
...@@ -179,7 +179,7 @@ bool PBMReader::ImplReadHeader() ...@@ -179,7 +179,7 @@ bool PBMReader::ImplReadHeader()
} }
while ( !bFinished ) while ( !bFinished )
{ {
if ( mrPBM.GetError() ) if (!mrPBM.good())
return false; return false;
mrPBM.ReadUChar( nDat ); mrPBM.ReadUChar( nDat );
......
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