Bug #18525 for Image-Info: Fixes TIFF.pm to allow it to correctly handle ACSII tags with a count of 4 or less

Show quoted text
attached

diff U3b N:\CodeDevelopment\internal\Image-Info_1.16_patched\Image-Info-1.16\lib\Image\Info\TIFF.pm N:\CodeDevelopment\internal\Image-Info_1.16_patched\TIFF_with_changes.pm --- N:\CodeDevelopment\internal\Image-Info_1.16_patched\Image-Info-1.16\lib\Image\Info\TIFF.pm Wed Jan 07 22:41:12 2004 +++ N:\CodeDevelopment\internal\Image-Info_1.16_patched\TIFF_with_changes.pm Tue Jan 10 12:16:13 2006 @@ -35,7 +35,7 @@ my $buf; seek($fh,$offset,0); my $n = read($fh,$buf,$len); - die "short read($len/$n)" unless $n == $len; + die "short read expected:$len found:$n at $offset)" unless $n == $len; # back to before. seek($fh,$curoffset,0); return $buf; @@ -119,15 +119,20 @@ my $fieldtype = unpack("S",my_read_order($fh,2,$byteorder)); my $count = unpack("L",my_read_order($fh,4,$byteorder)); my $offset; - if ($fieldtype == 3 && $count <= 1) { + if ($fieldtype == 2 && $count <= 4) { + # ASCII 4 or less bytes (inclusive of trailing null) - value is the offset + $offset = unpack("AAAA",my_read_order($fh,4,$byteorder)); + } elsif ($fieldtype == 3 && $count <= 1) { $offset = unpack("S",my_read_order($fh,2,$byteorder)); # skip rest my_read_order($fh,2,$byteorder); - } else { # fieldtype == 4 + } else { $offset = unpack("L",my_read_order($fh,4,$byteorder)); } my $val = ""; - if ($fieldtype == 2) { + if ($fieldtype == 2 && $count <= 4) { + $val = $offset; + } elsif ($fieldtype == 2) { $val = my_readbytes($fh,$offset,$count); } elsif (($fieldtype == 3 || $fieldtype == 4) && $count == 1) {

Moin, On Tuesday 18 April 2006 23:52, Guest via RT wrote: Show quoted text
Yes, thank you very much! I was overloaded and did not have time for Image::Info. There are a few other issues I wanted to kill at the same time, too. I will release a new version this weekend, no matter how far I get :) best wishes, Tels -- Signed on Wed Apr 19 00:52:06 2006 with key 0x93B84C15. Visit my photo gallery at http://bloodgate.com/photos/ PGP key on http://bloodgate.com/tels.asc or per email. "What is fair use? Fair use is not a law. There's nothing in law. Right now, any professor can show a complete movie in his classroom without paying a dime - that's fair use. What is not fair use is making a copy of an encrypted DVD, because once you're able to break the encryption, you've undermined the encryption itself." - Jack Valenti