summaryrefslogtreecommitdiff
path: root/filter
AgeCommit message (Collapse)AuthorFilesLines
2015-08-31filter: avoid casting BitmapChecksum to sal_uInt32Miklos Vajna3-8/+8
Since BitmapChecksum is a typedef for sal_uInt64. Change-Id: I768fa5134fa6e86559f3c6cbe1071093b4e68152
2015-08-31truncate checksum to 32-bit when it slips inside a file streamMarco Cecchetti3-8/+8
Change-Id: I2cedf8acf73f71529f4090ff2f9fce7ab7663e68
2015-08-31Switching to 64-bit checksum: substituted sal_uLong with BitmapChecksumMarco Cecchetti7-21/+23
A typedef sal_uLong BitmapChecksum; has been added to include/vcl/checksum.hxx Wherever needed sal_uLong and sal_Int32 has been substituted with BitmapChecksum. A BITMAP_CHECKSUM_BITS constant equal to the amount of bits used by the BitmapChecksum type has been defined and used in `GraphicID::GetIDString` (vstools/source/graphic/grfcache.cxx). Change-Id: I74bd285089e58a8b18c06233d75b87023c7bf31b
2015-08-31pClientData can be nullCaolán McNamara1-1/+1
Change-Id: I9375f84affdaef30d9b1ded31525e6b7b8709cbc (cherry picked from commit 7d4c77e374310bef538465d11980d1d610cbe0f1) Reviewed-on: https://gerrit.libreoffice.org/18149 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
2015-08-29eof isn't a Error, so use good not GetErrorCaolán McNamara1-14/+14
Change-Id: Ie1df87c7eb9d391d0fa4a579f744051a1f1b2ae1 (cherry picked from commit 078235028a8c4ea36b6b366348016e19759c456a) Reviewed-on: https://gerrit.libreoffice.org/18114 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2015-08-29check seeks and readsCaolán McNamara1-18/+44
Change-Id: I0c5c4784713376e0762bfbd197640f8d31b65562 (cherry picked from commit 1847753ab135f522df6a293a8539155437f0129f) Reviewed-on: https://gerrit.libreoffice.org/18112 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2015-08-28check stream state after read attemptCaolán McNamara1-1/+5
Change-Id: Ie3836f2e95acab963634181a07565343501f00f8 (cherry picked from commit 9a695e071020639926f8b038aba64eb016a1801a) Reviewed-on: https://gerrit.libreoffice.org/18092 Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Michael Meeks <michael.meeks@collabora.com>
2015-08-28check SeekToEndOfRecord for successCaolán McNamara1-1/+3
Change-Id: I7413a4e9e491b65122eaadb38ad574161f1aa943 (cherry picked from commit d417ffb7dd93306be7c89526a75acab53dbd8831) Reviewed-on: https://gerrit.libreoffice.org/18090 Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Michael Meeks <michael.meeks@collabora.com>
2015-08-28avoid loops in atom chainsCaolán McNamara1-3/+15
(cherry picked from commit de71eae5807ff94c8eace0eccaabf1ffa08e77b6) Change-Id: Icc40c0ee6c7d8d305cf7cc60cbf3e511c763aedd Reviewed-on: https://gerrit.libreoffice.org/18093 Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Michael Meeks <michael.meeks@collabora.com>
2015-08-28check seeks and offsetsCaolán McNamara1-5/+10
Change-Id: I2b6ded138b9101415fc49e93e1ec3ebcd3a9d2ae (cherry picked from commit 5ed690a3e8a575784ca25048e0229ebc52e6fccd) Reviewed-on: https://gerrit.libreoffice.org/18099 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2015-08-28check seekCaolán McNamara1-2/+4
Change-Id: I358758999bb918e73cdee2224e575e72c2131453 (cherry picked from commit 0c713e45f9831073e34777f50abf9b5801f08ed9) Reviewed-on: https://gerrit.libreoffice.org/18098 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2015-08-28check returns of SeekToEndOfRecordCaolán McNamara1-4/+22
Change-Id: Ia593dd0e2239a97f17bb03f005d22028da482445 (cherry picked from commit d400f155fdc3867ad4a067c2bf85588fc0fbb2a2) Reviewed-on: https://gerrit.libreoffice.org/18096 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2015-08-28crashtesting: tiff loop detection too slowCaolán McNamara1-4/+4
moz323894-1.tiff and moz456356-1.tiff take too long to load Change-Id: Iaafa064fd05e4a4152004e7ceb6256af68aeef01 (cherry picked from commit 7e373e92fc02393732422d05264dd5115076183f) Reviewed-on: https://gerrit.libreoffice.org/18095 Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Michael Meeks <michael.meeks@collabora.com>
2015-08-27extend seek, loop ending tests to ppt specific codeCaolán McNamara1-24/+21
Change-Id: Id4419b6b902b742117e248870b6a663c9c58955f (cherry picked from commit c249f93d96ec87b0acbd25ffe087543d6fe9fb14) Reviewed-on: https://gerrit.libreoffice.org/18052 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: David Tardon <dtardon@redhat.com>
2015-08-26various hangs, check seeks and record lengthsCaolán McNamara1-42/+70
Change-Id: Ided7f9376f41ee8cb1f6903e54a2d51e0e07e1a7 (cherry picked from commit a8b2dc80c41022515c3a1df6f7ea245c3390dc39) Reviewed-on: https://gerrit.libreoffice.org/18024 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2015-08-26don't hang on unreachable record endsCaolán McNamara1-2/+12
Change-Id: I288f7ff0327831603eda6e827c8acbae678dfaff (cherry picked from commit cadac8400a018c8c566379f7767ea5edff78523d) Reviewed-on: https://gerrit.libreoffice.org/18017 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2015-08-26fix crash on loading certain pptsCaolán McNamara1-3/+3
Change-Id: I544a67e3706c7d12414cc075118ef2f0f5ddd0f6 (cherry picked from commit 334dba623dfb0c4fb2b5292c2d03741b7b33aef1) Reviewed-on: https://gerrit.libreoffice.org/18015 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2015-08-25Avoid overflow in PBMReader::ImplReadHeaderStephan Bergmann1-0/+24
...as found by UBSan in CppunitTest_filter_ppm_test on filter/qa/cppunit/data/pbm/fail/crash-1.pbm Change-Id: Ib7c50ef1f07aba6b78f79c608be69c3dac38ddfe (cherry picked from commit 662498ab80833a2b671c247fb859603632e52105) Reviewed-on: https://gerrit.libreoffice.org/17984 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-08-25in reality we are limited to max sal_Int32 hereCaolán McNamara2-5/+12
so accept that and test if the values were accepted or limited Change-Id: Iaed5ebc2f12b52055506147c71117a2ad88d28ac (cherry picked from commit 0a76c1fd6875bd094ebe2bfbed3d01c98dc0c19e) Reviewed-on: https://gerrit.libreoffice.org/17972 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2015-08-25detect and reject loop in tifCaolán McNamara2-0/+12
Change-Id: I77d315fa432a3eb1a65539489a2ba6da8508b283 (cherry picked from commit 6b82437dca30eba0f0c9dde6fdc84cb8f7740f8f) Reviewed-on: https://gerrit.libreoffice.org/17957 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2015-08-13tdf#91782 - fix VirtualDevice allocation crasher in eps filter.Julien Nabet1-1/+1
Change-Id: I59cc13cebf9a15e873cd0b7f8fccffa37a6a8f39 Reviewed-on: https://gerrit.libreoffice.org/17688 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
2015-07-23tdf#92471: Improve color conversion to MSO highlightingZolnai Tamás4-1/+193
The simple color distance on RGB color space is not good enough. It leads to a better result if we use the scheme of the primary colors. This method works well with MSO highlighting color palette, but not neccessarily in general. In highlighting palette light and dark variant of the same color type (e.g. blue and light blue) has the exactly same scheme. (cherry picked from commit 16f9cf57e20ffbe34cb184f694f465708250a578) filter: filter_utils test needs tools library (from Michael Stahl) (cherry picked from commit 75d0f7262004d93d457b4b0b499ebf0b23fcda04) Missing boost_headers (from Stephan Bergmann) (cherry picked from commit bd8e8db250f99445dc1a8baa7ffc6ddfe90fdf5b) Change-Id: I0de6e4598f365fda1cccd1d3466429e52cf4067f Reviewed-on: https://gerrit.libreoffice.org/17052 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2015-07-21reject invalid tiff dimensionsCaolán McNamara2-0/+2
Change-Id: I64e77f12cb016a7f4a9d21c732aaeaae7959da76 (cherry picked from commit 34d062147c16090fa42c27ac7960e3f5e3b65d2b) Reviewed-on: https://gerrit.libreoffice.org/17257 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2015-07-20bail if offsets are past eofCaolán McNamara2-10/+19
Change-Id: I4a8e78231befff498894ec92a1f38af206e13129 (cherry picked from commit 97a0e7558b24792827d77217fb2d8b1106056963) Reviewed-on: https://gerrit.libreoffice.org/17232 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2015-07-20fail on short readCaolán McNamara2-2/+4
Change-Id: I7215cf8d8b1e4a4156c87507018de3c2b7ed08d8 (cherry picked from commit 8eaef6b5217eecaa111c80e426bdf225481a71fb) Reviewed-on: https://gerrit.libreoffice.org/17219 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2015-07-20don't hang on a bad ReadCodeAndDecodeCaolán McNamara2-1/+4
Change-Id: I999012d428fa84e21fe9e9f851a016eacc96a686 (cherry picked from commit 6964f67d0dd44c8a3c68caf194075ba5c649bf4b) Reviewed-on: https://gerrit.libreoffice.org/17217 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2015-07-20ensure loop ends eventuallyCaolán McNamara2-17/+22
Change-Id: I318385286fcc27ffb2d938237d83e793564d2525 (cherry picked from commit c02e79874951ba86d926186e284612806d8bc0a3) Reviewed-on: https://gerrit.libreoffice.org/17214 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2015-07-20test that nNumStripByteCounts value is within bounds of fileCaolán McNamara2-2/+5
Change-Id: If119628d7f510a7db30ed2180111063781cde887 (cherry picked from commit 33d43205c341e0cce36b6a1b3082c3927490cbde) Reviewed-on: https://gerrit.libreoffice.org/17210 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2015-07-20tdf92789 fix reading of some PICT imagesosnola2-37/+25
(cherry picked from commit 5fa73031aa42b62ccd167f193376565df2e635fc) Conflicts: filter/source/graphicfilter/ipict/ipict.cxx add a test image (cherry picked from commit 3f0677b86f4831b011a2baece85cf93c68646cd5) Change-Id: I6809ef52c462958eed2329fe2d32b5cbc691194c Reviewed-on: https://gerrit.libreoffice.org/17203 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-07-20final check np boundsCaolán McNamara2-0/+2
Change-Id: I9213bb2cc059e05e286598edac03bd72c84db876 (cherry picked from commit dcbbe7741a08f6076f9e020f90cbb730c1edafb9) Reviewed-on: https://gerrit.libreoffice.org/17212 Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Michael Meeks <michael.meeks@collabora.com>
2015-07-20check np bounds yet againCaolán McNamara2-0/+2
Change-Id: Id3f6fdc0ebed9711acec5d71f404e7a6072b765c (cherry picked from commit bca4d6f896fb12ceff37476c43ea8892898dd385) Reviewed-on: https://gerrit.libreoffice.org/17207 Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Michael Meeks <michael.meeks@collabora.com>
2015-07-20reduce scope, etc, don't loop endlesslyCaolán McNamara2-7/+2
Change-Id: I86e4e94392527b5faf5d9cdb4251853f35813f4e (cherry picked from commit 5d32a4ac5c166264c2d44e8df625eb768eb42fbe) Reviewed-on: https://gerrit.libreoffice.org/17204 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Michael Meeks <michael.meeks@collabora.com>
2015-07-20in reality we are limited to max sal_Int32 hereCaolán McNamara2-27/+27
so accept that and test if the values were accepted or limited Change-Id: I599cf8065a6f8786d380fdba03135857766770f3 (cherry picked from commit 80c591ea9c320fee9e975ac7b0e4e2df1bf5e447) Reviewed-on: https://gerrit.libreoffice.org/17197 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2015-07-20check np boundsCaolán McNamara2-0/+2
Change-Id: Id16ae9325f3c67792941b9c88d83435aa98282ca (cherry picked from commit be4e1141be7cd54cf5362d3de534050db5505437) Reviewed-on: https://gerrit.libreoffice.org/17199 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2015-07-20check np bounds againCaolán McNamara2-0/+2
Change-Id: I0fb61954b2eaf0c015d7bdefe9f03bd459b31501 (cherry picked from commit fcdddbd30a8b5cf6a5cc4d2ff28b7d4a20f8ec6b) Reviewed-on: https://gerrit.libreoffice.org/17201 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2015-07-17Resolves: tdf#92772 missing shape bg colorCaolán McNamara1-6/+4
regression from dcad3ac445980740b6a39761cdd1f1bd0b3e6e34 coverity#1242624 Untrusted loop bound Change-Id: Idf52c09828c2bab767e9ff0d07b61befd6bfc64b The original code read 8 bytes on the nElemSizeVert == 8 branch and always 4 otherwise. I assumed that nElemSizeVert had to be read as 4 on that branch, but apparently not. So if its not 4, set it to 4 and we get the same behaviour as originally and continue to ensure we bounds check the loop Change-Id: Ica8ab7cc3bbebee93216766a2e1279a579494840 (cherry picked from commit b3cd47bd562f98ec5fcff1a9d7609353506b5083) Reviewed-on: https://gerrit.libreoffice.org/17134 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: David Tardon <dtardon@redhat.com>
2015-07-17in remainingSize consider that its is possible to seek past the endCaolán McNamara1-0/+0
Change-Id: I1652244d5515629f1cd8f15f4c5b15f139dba0aa (cherry picked from commit 6a1f31898d4d44d69f4f65e56f5dd087607885af) Reviewed-on: https://gerrit.libreoffice.org/17158 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2015-07-17test that nNumStripOffsets value is within bounds of fileCaolán McNamara2-2/+5
Change-Id: I1483ea3671420be53496888892374641e10b344d (cherry picked from commit feedb957310fc3282ca47d5ffc1482dbb944a36e) Reviewed-on: https://gerrit.libreoffice.org/17151 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2015-07-17don't loop forever if pcx has short readCaolán McNamara2-2/+2
Change-Id: I638792417924bcb8e48995f4e789f84a2cbf4757 (cherry picked from commit c9ba7a2a4d29af2542f31562cfdd64db2237aea8) Reviewed-on: https://gerrit.libreoffice.org/17157 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2015-07-17detect another loop in tif formatCaolán McNamara2-1/+10
Change-Id: I950f751277d9080b4fc00c38f63453cce81bcc32 (cherry picked from commit 49bf2c6700d8f0fc9155ac2d06bf0a7bd84915d8) Reviewed-on: https://gerrit.libreoffice.org/17154 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2015-07-17detect loop in tif formatCaolán McNamara2-1/+11
Change-Id: I27645566cd9fc0ac8cf753f0217ae6cf0fa9929e (cherry picked from commit 290465b0effecb6d620adc20ca279f8057eeab9a) Reviewed-on: https://gerrit.libreoffice.org/17149 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2015-07-17min size of eps for a preview is 32Caolán McNamara2-7/+9
Change-Id: Icb82d9dd0a3918f2bdc4cb768c566774cd0d8ac4 (cherry picked from commit bf02304a0ea4771e01f39dd0032cbf276997ca00) Reviewed-on: https://gerrit.libreoffice.org/17132 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: David Tardon <dtardon@redhat.com>
2015-07-17exception on div by 0Caolán McNamara2-0/+5
Change-Id: Id33d6a5e3df5812babd28ebfc65b95ce97219ad3 (cherry picked from commit cf4159e16c13a13d0bedccebb50bb08f1662bc1c) Reviewed-on: https://gerrit.libreoffice.org/17121 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: David Tardon <dtardon@redhat.com>
2015-07-16tools polygons limited to 16bit indexesCaolán McNamara2-7/+26
Change-Id: Ib0f727a3681492c15b807ca159d8bf7675ee8f29 (cherry picked from commit 89857aacac98f0f8e5dca4718affec493951f904) WaE: C2220 Change-Id: Ibf9fa7ffc3beb237a470952c265fb1bce313a08a (cherry picked from commit 8547c336b3253d90daae1c79a2b1a57996a39102) Reviewed-on: https://gerrit.libreoffice.org/17091 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
2015-07-16don't hang with 0 len causing no progressionCaolán McNamara2-3/+9
Change-Id: Ie553dab291c7bfbde033d89b84159aff6b42a160 (cherry picked from commit 15dfcb7f461893f83abcf28bfe01a4164209a160) Reviewed-on: https://gerrit.libreoffice.org/17084 Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Michael Meeks <michael.meeks@collabora.com>
2015-07-16avoid hang in short pbmCaolán McNamara7-1/+6
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>
2015-07-16bump size typeCaolán McNamara2-3/+4
Change-Id: I2c32c253499a3efb22a3312ed1f0a608649ce124 (cherry picked from commit dc71a72753202d29544845cfd58992bac63c6837) Reviewed-on: https://gerrit.libreoffice.org/17088 Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Michael Meeks <michael.meeks@collabora.com>
2015-07-16check stream state more often for failuresCaolán McNamara2-10/+14
Change-Id: Ie45d858021c3123ec21829cbf4742cf30ce46665 (cherry picked from commit adfa89b5ffc3589b3a19a32e707a134cee232429) Reviewed-on: https://gerrit.libreoffice.org/17071 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Michael Meeks <michael.meeks@collabora.com>
2015-07-16don't hang if at end of streamCaolán McNamara3-2/+25010
Change-Id: I497a30041ec667237c2aa64963dcefb67753e87c (cherry picked from commit 5c8325325868753d2891556400c91651bce58402) Reviewed-on: https://gerrit.libreoffice.org/17116 Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Michael Meeks <michael.meeks@collabora.com>
2015-07-15file format documentation states these are signedCaolán McNamara2-9/+9
Change-Id: Iaca58dda19d24a767333ff642759414951a03e6d (cherry picked from commit 8a60e78769ebf6fc73ddc8ed7e43991fcb30fff4) Reviewed-on: https://gerrit.libreoffice.org/17063 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>