[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Jul 13 17:38:30 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=9df66ae
The following commit has been merged in the master branch:
commit 9df66ae09e9d15c333558b652f085926b142576a
Author: Andreas Huggel <ahuggel at gmx.net>
Date: Mon Jul 2 03:06:18 2007 +0000
#521: Reduced size limit for Exif tags.
---
src/ifd.cpp | 18 +++----
test/data/bugfixes-test.out | 127 ++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 135 insertions(+), 10 deletions(-)
diff --git a/src/ifd.cpp b/src/ifd.cpp
index c743570..6d45ea8 100644
--- a/src/ifd.cpp
+++ b/src/ifd.cpp
@@ -357,18 +357,16 @@ namespace Exiv2 {
pe.type_ = getUShort(buf + o + 2, byteOrder);
pe.count_ = getULong(buf + o + 4, byteOrder);
uint32_t ts = TypeInfo::typeSize(TypeId(pe.type_));
- if (pe.count_ >= 0x10000000 && ts != 0) {
- if (pe.count_ >= 0x80000000 / ts) {
+ if (pe.count_ >= 0x10000000) {
#ifndef SUPPRESS_WARNINGS
- std::cerr << "Warning: "
- << ExifTags::ifdName(ifdId_) << " tag 0x"
- << std::setw(4) << std::setfill('0') << std::hex
- << pe.tag_ << " has invalid size "
- << std::dec << pe.count_ << "*" << ts
- << "; truncating the data.
";
+ std::cerr << "Warning: "
+ << ExifTags::ifdName(ifdId_) << " tag 0x"
+ << std::setw(4) << std::setfill('0') << std::hex
+ << pe.tag_ << " has invalid size "
+ << std::dec << pe.count_ << "*" << ts
+ << "; truncating the data.
";
#endif
- pe.count_ = 0;
- }
+ pe.count_ = 0;
}
pe.size_ = pe.count_ * ts;
pe.offsetLoc_ = o + 8 - shift;
diff --git a/test/data/bugfixes-test.out b/test/data/bugfixes-test.out
index 79999a3..7f4c8b9 100644
--- a/test/data/bugfixes-test.out
+++ b/test/data/bugfixes-test.out
@@ -259,6 +259,133 @@ Comparing IPTC and IRB data... ok
Caught Exiv2 exception 'Size of IPTC JPEG segment is larger than 65535 bytes'
------> Bug 495 <-------
Error: Directory Iop with 768 entries considered invalid; not read.
+Warning: IFD1 tag 0x006e has invalid size 869020620*0; truncating the data.
+Warning: IFD1 tag 0x33cc has invalid size 869020620*0; truncating the data.
+Warning: IFD1 tag 0x33cc has invalid size 869020620*0; truncating the data.
+Warning: IFD1 tag 0x33cc has invalid size 869020620*0; truncating the data.
+Warning: IFD1 tag 0x33cc has invalid size 869020620*0; truncating the data.
+Warning: IFD1 tag 0x0c0e has invalid size 286134035*0; truncating the data.
+Warning: IFD1 tag 0x1812 has invalid size 370611991*0; truncating the data.
+Warning: IFD1 tag 0x1916 has invalid size 370611713*0; truncating the data.
+Warning: IFD1 tag 0x1616 has invalid size 370546198*0; truncating the data.
+Warning: IFD1 tag 0x1616 has invalid size 370546198*0; truncating the data.
+Warning: IFD1 tag 0x1616 has invalid size 370546198*0; truncating the data.
+Warning: IFD1 tag 0x1616 has invalid size 370546198*0; truncating the data.
+Warning: IFD1 tag 0x0809 has invalid size 268435969*0; truncating the data.
+Warning: IFD1 tag 0x0004 has invalid size 304165185*0; truncating the data.
+Warning: IFD1 tag 0x0722 has invalid size 847352225*0; truncating the data.
+Warning: IFD1 tag 0xc115 has invalid size 4028904290*0; truncating the data.
+Warning: IFD1 tag 0x1617 has invalid size 438642215*0; truncating the data.
+Warning: IFD1 tag 0x3536 has invalid size 960119620*0; truncating the data.
+Warning: IFD1 tag 0x494a has invalid size 1431721816*0; truncating the data.
+Warning: IFD1 tag 0x6566 has invalid size 1768584052*0; truncating the data.
+Warning: IFD1 tag 0x797a has invalid size 2240186248*0; truncating the data.
+Warning: IFD1 tag 0x9495 has invalid size 2560203426*0; truncating the data.
+Warning: IFD1 tag 0xa7a8 has invalid size 2998121653*0; truncating the data.
+Warning: IFD1 tag 0xbac2 has invalid size 3318138824*0; truncating the data.
+Warning: IFD1 tag 0xd4d5 has invalid size 3638156001*0; truncating the data.
+Warning: IFD1 tag 0xe6e7 has invalid size 3941724915*0; truncating the data.
+Warning: IFD1 tag 0x4151 has invalid size 1897079346*0; truncating the data.
+Warning: IFD1 tag 0xd10a has invalid size 887170545*0; truncating the data.
+Warning: IFD1 tag 0x2627 has invalid size 708130359*0; truncating the data.
+Warning: IFD1 tag 0x4445 has invalid size 1212762707*0; truncating the data.
+Warning: IFD1 tag 0x5859 has invalid size 1684366951*0; truncating the data.
+Warning: IFD1 tag 0x7475 has invalid size 2021227138*0; truncating the data.
+Warning: IFD1 tag 0x8788 has invalid size 2459145365*0; truncating the data.
+Warning: IFD1 tag 0x9aa2 has invalid size 2779162536*0; truncating the data.
+Warning: IFD1 tag 0xb4b5 has invalid size 3099179714*0; truncating the data.
+Warning: IFD1 tag 0xc7c8 has invalid size 3537097941*0; truncating the data.
+Warning: IFD1 tag 0xdae2 has invalid size 3857115112*0; truncating the data.
+Warning: IFD1 tag 0xf4f5 has invalid size 4177132287*0; truncating the data.
+Warning: IFD1 tag 0x0a28 has invalid size 2148149248*0; truncating the data.
+Warning: IFD1 tag 0x03d7 has invalid size 1325627507*0; truncating the data.
+Warning: IFD1 tag 0x00c2 has invalid size 2108709003*0; truncating the data.
+Warning: IFD1 tag 0x47b7 has invalid size 3152949455*0; truncating the data.
+Warning: IFD1 tag 0xd7e0 has invalid size 1376255059*0; truncating the data.
+Warning: IFD1 tag 0x9ffe has invalid size 1435952600*0; truncating the data.
+Warning: IFD1 tag 0xa90b has invalid size 2948330302*0; truncating the data.
+Warning: IFD1 tag 0x6962 has invalid size 1254710178*0; truncating the data.
+Warning: IFD1 tag 0x48ee has invalid size 2579956671*0; truncating the data.
+Warning: IFD1 tag 0xaee5 has invalid size 2145902562*0; truncating the data.
+Warning: IFD1 tag 0x79a6 has invalid size 4278191614*0; truncating the data.
+Warning: IFD1 tag 0xc322 has invalid size 1509884106*0; truncating the data.
+Warning: IFD1 tag 0x1ca0 has invalid size 4167173759*0; truncating the data.
+Warning: IFD1 tag 0xc9fb has invalid size 961936783*0; truncating the data.
+Warning: IFD1 tag 0xff00 has invalid size 1804467839*0; truncating the data.
+Warning: IFD1 tag 0xf023 has invalid size 956235908*0; truncating the data.
+Warning: IFD1 tag 0x173f has invalid size 2491156472*0; truncating the data.
+Warning: IFD1 tag 0x1ff9 has invalid size 4278248340*0; truncating the data.
+Warning: IFD1 tag 0x1ff3 has invalid size 2145791981*0; truncating the data.
+Warning: IFD1 tag 0x7fd0 has invalid size 3927392252*0; truncating the data.
+Warning: IFD1 tag 0x07fc has invalid size 1610188790*0; truncating the data.
+Warning: IFD1 tag 0x0005 has invalid size 4278239877*0; truncating the data.
+Warning: IFD1 tag 0x5ce3 has invalid size 390069362*0; truncating the data.
+Warning: IFD1 tag 0xc2e0 has invalid size 1490015056*0; truncating the data.
+Warning: IFD1 tag 0x94ff has invalid size 2954884079*0; truncating the data.
+Warning: IFD1 tag 0xed6c has invalid size 4262198403*0; truncating the data.
+Warning: IFD1 tag 0xeffa has invalid size 4070667263*0; truncating the data.
+Warning: IFD1 tag 0xc04f has invalid size 4278227291*0; truncating the data.
+Warning: IFD1 tag 0xff00 has invalid size 1068593183*0; truncating the data.
+Warning: IFD1 tag 0xe62f has invalid size 1878261259*0; truncating the data.
+Warning: IFD1 tag 0x7e17 has invalid size 1164771072*0; truncating the data.
+Warning: IFD1 tag 0x008e has invalid size 2160003910*0; truncating the data.
+Warning: IFD1 tag 0xdffb has invalid size 4278226513*0; truncating the data.
+Warning: IFD1 tag 0x009f has invalid size 4278202622*0; truncating the data.
+Warning: IFD1 tag 0x3fe0 has invalid size 1341673663*0; truncating the data.
+Warning: IFD1 tag 0x457f has invalid size 1946091719*0; truncating the data.
+Warning: IFD1 tag 0x85dc has invalid size 3308228603*0; truncating the data.
+Warning: IFD1 tag 0xf1ca has invalid size 2954884079*0; truncating the data.
+Warning: IFD1 tag 0xed7c has invalid size 4262198404*0; truncating the data.
+Warning: IFD1 tag 0x81ff has invalid size 3329359616*0; truncating the data.
+Warning: IFD1 tag 0x395e has invalid size 1559759810*0; truncating the data.
+Warning: IFD1 tag 0x847f has invalid size 3174296671*0; truncating the data.
+Warning: IFD1 tag 0xfe91 has invalid size 4135148414*0; truncating the data.
+Warning: IFD1 tag 0xba7a has invalid size 2581960778*0; truncating the data.
+Warning: IFD1 tag 0x0b35 has invalid size 3136502770*0; truncating the data.
+Warning: IFD1 tag 0x1518 has invalid size 1325209447*0; truncating the data.
+Warning: IFD1 tag 0x2426 has invalid size 3198103512*0; truncating the data.
+Warning: IFD1 tag 0x5f47 has invalid size 2172780597*0; truncating the data.
+Warning: IFD1 tag 0x382f has invalid size 2573635967*0; truncating the data.
+Warning: IFD1 tag 0x90e1 has invalid size 3766300996*0; truncating the data.
+Warning: IFD1 tag 0x2df3 has invalid size 547125052*0; truncating the data.
+Warning: IFD1 tag 0x703a has invalid size 2759429426*0; truncating the data.
+Warning: IFD1 tag 0x2d8f has invalid size 1244516162*0; truncating the data.
+Warning: IFD1 tag 0xf662 has invalid size 884958755*0; truncating the data.
+Warning: IFD1 tag 0x31cb has invalid size 3357080146*0; truncating the data.
+Warning: IFD1 tag 0xf3e2 has invalid size 2965333821*0; truncating the data.
+Warning: IFD1 tag 0x019a has invalid size 4133636061*0; truncating the data.
+Warning: IFD1 tag 0xc74a has invalid size 282769018*0; truncating the data.
+Warning: IFD1 tag 0x638c has invalid size 1366339725*0; truncating the data.
+Warning: IFD1 tag 0x34ff has invalid size 1122185631*0; truncating the data.
+Warning: IFD1 tag 0xbbff has invalid size 1469553727*0; truncating the data.
+Warning: IFD1 tag 0x347a has invalid size 4278218119*0; truncating the data.
+Warning: IFD1 tag 0x00c1 has invalid size 840898528*0; truncating the data.
+Warning: IFD1 tag 0x00db has invalid size 1768802339*0; truncating the data.
+Warning: IFD1 tag 0xcad8 has invalid size 4278204020*0; truncating the data.
+Warning: IFD1 tag 0x7f2f has invalid size 767086379*0; truncating the data.
+Warning: IFD1 tag 0x8eb5 has invalid size 511650037*0; truncating the data.
+Warning: IFD1 tag 0x1428 has invalid size 2287325638*0; truncating the data.
+Warning: IFD1 tag 0xf714 has invalid size 2425449917*0; truncating the data.
+Warning: IFD1 tag 0x6d57 has invalid size 1163615328*0; truncating the data.
+Warning: IFD1 tag 0xc3d2 has invalid size 1015255771*0; truncating the data.
+Warning: IFD1 tag 0x3c8a has invalid size 4278216689*0; truncating the data.
+Warning: IFD1 tag 0x627d has invalid size 2501457021*0; truncating the data.
+Warning: IFD1 tag 0xf4a7 has invalid size 1359851067*0; truncating the data.
+Warning: IFD1 tag 0x83c2 has invalid size 3112608454*0; truncating the data.
+Warning: IFD1 tag 0x126b has invalid size 4163441758*0; truncating the data.
+Warning: IFD1 tag 0x35e9 has invalid size 3519734636*0; truncating the data.
+Warning: IFD1 tag 0x13fe has invalid size 2609876152*0; truncating the data.
+Warning: IFD1 tag 0xb8af has invalid size 795072478*0; truncating the data.
+Warning: IFD1 tag 0x0d15 has invalid size 3015384843*0; truncating the data.
+Warning: IFD1 tag 0xc913 has invalid size 1014904098*0; truncating the data.
+Warning: IFD1 tag 0xb5dd has invalid size 526793792*0; truncating the data.
+Warning: IFD1 tag 0xac48 has invalid size 356575392*0; truncating the data.
+Warning: IFD1 tag 0x7b32 has invalid size 3890608881*0; truncating the data.
+Warning: IFD1 tag 0x34fd has invalid size 2564885236*0; truncating the data.
+Warning: IFD1 tag 0xf771 has invalid size 3495873650*0; truncating the data.
+Warning: IFD1 tag 0x4be5 has invalid size 950529285*0; truncating the data.
+Warning: IFD1 tag 0x8ce3 has invalid size 3539536391*0; truncating the data.
+Warning: IFD1 tag 0x909f has invalid size 3483706178*0; truncating the data.
Warning: IFD1: Pointer to next IFD is out of bounds; ignored.
Error: Upper boundary of the 1st data entry of IFD1 is out of bounds:
Offset = 0x0203fa04, exceeds buffer size by 168813082 Bytes
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list