diff --git a/src/image.cpp b/src/image.cpp index 94228280..66859c35 100644 --- a/src/image.cpp +++ b/src/image.cpp @@ -614,7 +614,7 @@ namespace Exiv2 { void Image::setIccProfile(Exiv2::DataBuf& iccProfile,bool bTestValid) { if ( bTestValid ) { - if ( iccProfile.pData_ && ( iccProfile.size_ < sizeof(long)) ) throw Error(53); + if ( iccProfile.pData_ && ( iccProfile.size_ < (long) sizeof(long)) ) throw Error(53); long size = iccProfile.pData_ ? getULong(iccProfile.pData_, bigEndian): -1; if ( size!= iccProfile.size_ ) throw Error(53); } diff --git a/test/bugfixes-test.sh b/test/bugfixes-test.sh index 8551e03f..8a76b4db 100755 --- a/test/bugfixes-test.sh +++ b/test/bugfixes-test.sh @@ -607,6 +607,12 @@ source ./functions.source copyTestFile $filename runTest exiv2 -pa $filename + num=1247 + printf "$num " >&3 + filename=exiv2-bug$num.jpg + copyTestFile $filename + runTest exiv2 -pa $filename + ) 3>&1 > $results 2>&1 printf "\n" diff --git a/test/data/bugfixes-test.out b/test/data/bugfixes-test.out index 633db14c..ca12a10e 100644 Binary files a/test/data/bugfixes-test.out and b/test/data/bugfixes-test.out differ diff --git a/test/data/exiv2-bug1247.jpg b/test/data/exiv2-bug1247.jpg new file mode 100644 index 00000000..c9b2be02 Binary files /dev/null and b/test/data/exiv2-bug1247.jpg differ