diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-07-15 14:01:46 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2015-07-16 09:11:36 +0000 |
| commit | c48004eb562a9c4b377cf31a09a04cb03abdc58e (patch) | |
| tree | c2c19517cf81c278a8764be7625b70040d23bfbb /filter | |
| parent | e39e26533cba5be4445bdb39884bb1bc32083bbb (diff) | |
avoid hang in short pbm
Change-Id: I9b7f0832a4dc231e1e8f963858c155e3cd392667
(cherry picked from commit b8637e67d6d39e47d22cfce496000288f0dc58d8)
Reviewed-on: https://gerrit.libreoffice.org/17083
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/qa/cppunit/data/pbm/fail/.gitignore | 0 | ||||
| -rw-r--r-- | filter/qa/cppunit/data/pbm/fail/hang-1.pbm | bin | 0 -> 266 bytes | |||
| -rw-r--r-- | filter/qa/cppunit/data/pbm/indeterminate/.gitignore | 1 | ||||
| -rw-r--r-- | filter/qa/cppunit/data/pbm/pass/.gitignore | 0 | ||||
| -rw-r--r-- | filter/qa/cppunit/data/pbm/pass/rhbz160429-1.pbm | bin | 0 -> 456 bytes | |||
| -rw-r--r-- | filter/qa/cppunit/filters-ppm-test.cxx | 4 | ||||
| -rw-r--r-- | filter/source/graphicfilter/ipbm/ipbm.cxx | 2 |
7 files changed, 6 insertions, 1 deletions
diff --git a/filter/qa/cppunit/data/pbm/fail/.gitignore b/filter/qa/cppunit/data/pbm/fail/.gitignore new file mode 100644 index 000000000000..e69de29bb2d1 --- /dev/null +++ b/filter/qa/cppunit/data/pbm/fail/.gitignore diff --git a/filter/qa/cppunit/data/pbm/fail/hang-1.pbm b/filter/qa/cppunit/data/pbm/fail/hang-1.pbm Binary files differnew file mode 100644 index 000000000000..21742d204c79 --- /dev/null +++ b/filter/qa/cppunit/data/pbm/fail/hang-1.pbm diff --git a/filter/qa/cppunit/data/pbm/indeterminate/.gitignore b/filter/qa/cppunit/data/pbm/indeterminate/.gitignore new file mode 100644 index 000000000000..e9c5b1765b8f --- /dev/null +++ b/filter/qa/cppunit/data/pbm/indeterminate/.gitignore @@ -0,0 +1 @@ +*.ppm-* diff --git a/filter/qa/cppunit/data/pbm/pass/.gitignore b/filter/qa/cppunit/data/pbm/pass/.gitignore new file mode 100644 index 000000000000..e69de29bb2d1 --- /dev/null +++ b/filter/qa/cppunit/data/pbm/pass/.gitignore diff --git a/filter/qa/cppunit/data/pbm/pass/rhbz160429-1.pbm b/filter/qa/cppunit/data/pbm/pass/rhbz160429-1.pbm Binary files differnew file mode 100644 index 000000000000..d6e3fc6349b8 --- /dev/null +++ b/filter/qa/cppunit/data/pbm/pass/rhbz160429-1.pbm diff --git a/filter/qa/cppunit/filters-ppm-test.cxx b/filter/qa/cppunit/filters-ppm-test.cxx index e98ce6f6732e..10f265888964 100644 --- a/filter/qa/cppunit/filters-ppm-test.cxx +++ b/filter/qa/cppunit/filters-ppm-test.cxx @@ -62,6 +62,10 @@ void PpmFilterTest::testCVEs() testDir(OUString(), getURLFromSrc("/filter/qa/cppunit/data/ppm/"), OUString()); + + testDir(OUString(), + getURLFromSrc("/filter/qa/cppunit/data/pbm/"), + OUString()); } CPPUNIT_TEST_SUITE_REGISTRATION(PpmFilterTest); diff --git a/filter/source/graphicfilter/ipbm/ipbm.cxx b/filter/source/graphicfilter/ipbm/ipbm.cxx index 248d4dfa9a72..e545334b78c6 100644 --- a/filter/source/graphicfilter/ipbm/ipbm.cxx +++ b/filter/source/graphicfilter/ipbm/ipbm.cxx @@ -179,7 +179,7 @@ bool PBMReader::ImplReadHeader() } while ( !bFinished ) { - if ( mrPBM.GetError() ) + if (!mrPBM.good()) return false; mrPBM.ReadUChar( nDat ); |