Commit Graph

5181 Commits

Author SHA1 Message Date
Robin Mills
907326673e Jenkins maintenance 2017-09-29 12:35:56 +01:00
Robin Mills
c71322bff7 Correction for buildbreaker in 2f010487 2017-09-29 11:04:17 +01:00
Robin Mills
2f0104879a Merge pull request #81 from piponazo/robinChanges
Robin changes
2017-09-29 10:15:21 +01:00
clanmills
d43cd82002 Fix #80 2017-09-29 10:01:22 +01:00
clanmills
7fa8d31302 #49 and #79 Thanks to Dan and Raffael for working with me on this. 2017-09-29 10:00:30 +01:00
Robin Mills
272fc46502 Merge pull request #79 from D4N/fix_76
Fixed wrong brackets: size*count + pad can overflow before the cast
2017-09-29 09:38:55 +01:00
Luis Díaz Más
8ad49f6d73 Robin changes in sync with master changes 2017-09-28 19:42:57 +02:00
Dan Čermák
74cb5bab13 Fixed wrong brackets: size*count + pad can overflow before the cast
=> Should fix #76 (most of the work has been done by Robin Mills in
   6e3855aed7)

The problem with #76 is the contents of the 26th IFD, with the
following contents:
tag: 0x8649
type: 0x1
count: 0xffff ffff
offset: 0x4974

The issue is the size of count (uint32_t), as adding anything to it
causes an overflow. Especially the expression:
(size*count + pad+20)
results in an overflow and gives 20 as a result instead of
0x100000014, thus the condition in the if in the next line is false
and the program continues to run (until it crashes at io.read).

To properly account for the overflow, the brackets have to be removed,
as then the result is saved in the correctly sized type and not cast
after being calculated in the smaller type.

The brackets have also been removed from bigtiffimage.cpp, where the
same issue is present.
2017-09-27 23:38:49 +02:00
Robin Mills
d8ae4484ae msvc support for bigtiffimage.cpp 2017-09-27 12:24:41 +01:00
Robin Mills
e1948c7ff9 msvc/bigtiffimage support 2017-09-27 11:17:11 +01:00
clanmills
6e3855aed7 Fix https://github.com/Exiv2/exiv2/issues/55 2017-09-27 09:20:13 +01:00
clanmills
ae253b95d1 Adding missing test file. 2017-09-26 22:54:49 +01:00
clanmills
9aad5cd6df Adding missing test file. 2017-09-26 22:53:45 +01:00
clanmills
e3298ab5e1 Integrating #55 and #78 2017-09-26 22:32:27 +01:00
Robin Mills
81f22c7335 Merge pull request #78 from D4N/gcc_fix
Added missing include for INT_MIN & INT_MAX constants
2017-09-26 22:27:53 +01:00
Dan Čermák
d4e7510f7c Added missing include for INT_MIN & INT_MAX constants 2017-09-26 22:57:59 +02:00
clanmills
8a8f60a4e7 Fix https://github.com/Exiv2/exiv2/issues/55 Thank You, Raphaël Hertzog. 2017-09-26 21:37:53 +01:00
clanmills
08d2bac2c1 Documentation changes. 2017-09-26 18:18:31 +01:00
clanmills
eef3963dc7 Documentation Update. 2017-09-26 16:30:29 +01:00
Robin Mills
c07e4fad65 Merge pull request #77 from piponazo/notesAboutConan
Add notes about how to use conan
2017-09-26 15:50:59 +01:00
Pix4d
22a2500c67 Add notes about how to use conan 2017-09-26 15:52:57 +02:00
Robin Mills
197375dfa4 Merge pull request #72 from Kicer86/bigtiff
Some improvements, crash fix.
2017-09-24 20:43:31 +01:00
Michał Walenciak
9acc1c56a7 adding ifd8 and long longs to is8ByteType() 2017-09-24 16:07:26 +02:00
clanmills
fe68e7a6b5 Updating WORK-IN-PROGRESS for Tiff Refactoring 2017-09-24 06:33:40 +01:00
Michał Walenciak
4837d8cf58 changing header + some warning fix 2017-09-22 21:22:55 +02:00
Robin Mills
6fd0bc9e10 Adding ./configure support for bigtiffimage.cpp 2017-09-22 19:05:40 +01:00
Robin Mills
0153784ae3 Merge pull request #70 from Kicer86/bigtiff
Initial support for BigTiffs. Print only.
2017-09-22 18:44:05 +01:00
clanmills
75935516e3 Removing test/tmp/ReadMe.txt which was added to counter test/tmp not being created 2017-09-22 10:24:01 +01:00
clanmills
678e2b8517 Explicitly list files to be processed CMake generated builds [remove file(GLOB...)] 2017-09-22 10:05:11 +01:00
clanmills
3755d7c191 #20 Thank You, mfg92 for your contribution. 2017-09-22 07:38:49 +01:00
clanmills
599e555de9 Fix https://github.com/Exiv2/exiv2/pull/20#issuecomment-330859079 2017-09-21 22:28:11 +01:00
Michał Walenciak
734a2c3d57 fixing TODO 2017-09-21 18:15:12 +02:00
Michał Walenciak
e3ff1ba694 fixing indent 2017-09-21 18:15:12 +02:00
Michał Walenciak
4629227358 fix for IPTCNAA
dir_offset was used instead of offset
2017-09-21 18:15:12 +02:00
Michał Walenciak
cc3633ea59 removing POC 2017-09-21 18:15:12 +02:00
Michał Walenciak
4f6f5b4946 removing conditional_byte_swap* functions 2017-09-21 18:15:12 +02:00
Michał Walenciak
b6e79357de Adding 8-byte swap functions + consts 2017-09-21 18:15:12 +02:00
Michał Walenciak
f96d84ba8c dropping dead code 2017-09-21 18:15:12 +02:00
Michał Walenciak
50ecf672b5 using Internal::indent() 2017-09-21 18:15:12 +02:00
Michał Walenciak
f8ac7a5dc3 renaming Tiff to StandardTiff 2017-09-21 18:15:12 +02:00
Michał Walenciak
d460bbdb3f fix for standard tiff case 2017-09-21 18:15:12 +02:00
Michał Walenciak
81aa8828e0 applying dff941ad7f 2017-09-21 18:15:12 +02:00
Michał Walenciak
874daede53 fixing broken print for 'offset' column 2017-09-21 18:15:12 +02:00
Michał Walenciak
8b07982bf2 variable names cleanup 2017-09-21 18:15:12 +02:00
Michał Walenciak
1a1dc3afd4 simplifying code 2017-09-21 18:15:12 +02:00
Michał Walenciak
c6cbf69c49 first attempt to read both - standard and big tiff 2017-09-21 18:15:12 +02:00
Michał Walenciak
972e302cba some cleanups 2017-09-21 18:15:12 +02:00
Michał Walenciak
3c9817339a Dropping BasicIo& io parameter.
We already have acces to it via Image class
2017-09-21 18:15:12 +02:00
Michał Walenciak
65722a0020 dropping bSwap parameter
Member is better.
2017-09-21 18:15:12 +02:00
Michał Walenciak
7e291ef226 Encapsulating Header's members 2017-09-21 18:15:12 +02:00