exiftool_vendored 10.40.0 → 10.43.0

data/bin/{Image-ExifTool-10.40 → Image-ExifTool-10.43}/lib/Image/ExifTool/Exif.pm

@@ -2058,7 +2058,7 @@ my %sampleFormat = (
         PrintConvInv => '$val=~s/\s*mm$//;$val',
     },
     # Note: tags 0x920b-0x9217 are duplicates of 0xa20b-0xa217
-    # (The TIFF standard uses 0xa2xx, but you'll find both in images)
+    # (The EXIF standard uses 0xa2xx, but you'll find both in images)
     0x920b => { #12
         Name => 'FlashEnergy',
         Groups => { 2 => 'Camera' },
@@ -2342,7 +2342,6 @@ my %sampleFormat = (
         Name => 'FlashEnergy',
         Groups => { 2 => 'Camera' },
         Writable => 'rational64u',
-        Count => -1, # 1 or 2 (ref 12)
     },
     0xa20c => {
         Name => 'SpatialFrequencyResponse',
@@ -3172,7 +3171,7 @@ my %sampleFormat = (
         Name => 'MaskedAreas',
         Writable => 'int32u',
         WriteGroup => 'SubIFD',
-        Count => 4,
+        Count => -1,
         Protected => 1,
     },
     0xc68f => {
@@ -5226,23 +5225,30 @@ sub ProcessExif($$$)
     my $firstBase = $base;
     my $raf = $$dirInfo{RAF};
     my $verbose = $et->Options('Verbose');
+    my $validate = $et->Options('Validate');
     my $htmlDump = $$et{HTML_DUMP};
     my $success = 1;
     my ($tagKey, $dirSize, $makerAddr, $strEnc);
     my $inMakerNotes = $$tagTablePtr{GROUPS}{0} eq 'MakerNotes';
 
+    require Image::ExifTool::Validate if $validate;
+
     # set encoding to assume for strings
     $strEnc = $et->Options('CharsetEXIF') if $$tagTablePtr{GROUPS}{0} eq 'EXIF';
 
     # ignore non-standard EXIF while in strict MWG compatibility mode
-    if ($Image::ExifTool::MWG::strict and $dirName eq 'IFD0' and
+    if (($validate or $Image::ExifTool::MWG::strict) and $dirName eq 'IFD0' and
         $tagTablePtr eq \%Image::ExifTool::Exif::Main and
         $$et{FILE_TYPE} =~ /^(JPEG|TIFF|PSD)$/)
     {
         my $path = $et->MetadataPath();
         unless ($path =~ /^(JPEG-APP1-IFD0|TIFF-IFD0|PSD-EXIFInfo-IFD0)$/) {
-            $et->Warn("Ignored non-standard EXIF at $path");
-            return 1;
+            if ($Image::ExifTool::MWG::strict) {
+                $et->Warn("Ignored non-standard EXIF at $path");
+                return 1;
+            } else {
+                $et->Warn("Non-standard EXIF at $path", 1);
+            }
         }
     }
     $verbose = -1 if $htmlDump; # mix htmlDump into verbose so we can test for both at once
@@ -5368,7 +5374,7 @@ sub ProcessExif($$$)
             $et->HDump($entry+$dataPos+$base,12,"[invalid IFD entry]",
                        "Bad format type: $format", 1);
             # warn unless the IFD was just padded with zeros
-            if ($format) {
+            if ($format or $validate) {
                 $et->Warn("Bad format ($format) for $name entry $index", $inMakerNotes);
                 ++$warnCount;
             }
@@ -5394,15 +5400,28 @@ sub ProcessExif($$$)
                 $origFormStr = $formatName[$format] . '[' . $oldCount . ']' if $oldCount != $count;
             }
         }
+        $validate and not $inMakerNotes and Image::ExifTool::Validate::ValidateExif(
+            $et, $tagTablePtr, $tagID, $tagInfo, $lastID, $name, $count, $formatStr);
         my $size = $count * $formatSize[$format];
         my $readSize = $size;
         if ($size > 4) {
             if ($size > 0x7fffffff) {
-                $et->Warn(sprintf("Invalid size (%u) for %s tag 0x%.4x", $size, $name, $tagID));
+                $et->Warn(sprintf("Invalid size (%u) for %s tag 0x%.4x", $size, $name, $tagID), $inMakerNotes);
                 ++$warnCount;
                 next;
             }
             $valuePtr = Get32u($dataPt, $valuePtr);
+            if ($validate and not $inMakerNotes) {
+                $et->Warn(sprintf('Odd offset for %s tag 0x%.4x', $name, $tagID), 1) if $valuePtr & 0x01;
+                if ($valuePtr < 8 || $valuePtr + $size > ($$et{VALUE}{FileSize} || length($$dataPt))) {
+                    $et->Warn(sprintf("Invalid offset for %s tag 0x%.4x", $name, $tagID));
+                    ++$warnCount;
+                    next;
+                }
+                if ($valuePtr + $size > $dirStart + $dataPos and $valuePtr < $dirEnd + $dataPos + 4) {
+                    $et->Warn(sprintf("Value for %s tag 0x%.4x overlaps IFD", $name, $tagID));
+                }
+            }
             # fix valuePtr if necessary
             if ($$dirInfo{FixOffsets}) {
                 my $wFlag;
@@ -5516,7 +5535,7 @@ sub ProcessExif($$$)
                             };
                         }
                     } else {
-                        $et->Warn("Bad $name offset for $tagStr");
+                        $et->Warn("Bad offset for $name $tagStr", $inMakerNotes);
                         ++$warnCount;
                     }
                     unless (defined $buff) {

data/bin/{Image-ExifTool-10.40 → Image-ExifTool-10.43}/lib/Image/ExifTool/Geotag.pm

@@ -24,7 +24,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:Public);
 
-$VERSION = '1.50';
+$VERSION = '1.51';
 
 sub JITTER() { return 2 }       # maximum time jitter
 
@@ -406,7 +406,7 @@ DoneFix:    $isDate = 1;
             #  $GPGGA,092204.999,4250.5589,S,14718.5084,E,1,04,24.4,19.7,M,,,,0000*1F
             #  $GPGGA,093657.000,3652.835020,N,01053.104094,E,,8,,166.924,M,40.9,M,,*77
             #  $GPGGA,hhmmss.sss,ddmm.mmmm,N/S,dddmm.mmmm,E/W,0=invalid,sats,hdop,alt,M,...
-            /^\$GPGGA,(\d{2})(\d{2})(\d+(\.\d*)?),(\d*?)(\d{1,2}\.\d+),([NS]),(\d*?)(\d{1,2}\.\d+),([EW]),[1-6]?,(\d+)?,(\.\d+|\d+\.?\d*)?,(-?\d+\.?\d*)?,M?,/ or next;
+            /^\$GPGGA,(\d{2})(\d{2})(\d+(\.\d*)?),(\d*?)(\d{1,2}\.\d+),([NS]),(\d*?)(\d{1,2}\.\d+),([EW]),[1-6]?,(\d+)?,(\.\d+|\d+\.?\d*)?,(-?\d+\.?\d*)?,M?/ or next;
             $fix{lat} = (($5 || 0) + $6/60) * ($7 eq 'N' ? 1 : -1);
             $fix{lon} = (($8 || 0) + $9/60) * ($10 eq 'E' ? 1 : -1);
             @fix{qw(nsats hdop alt)} = ($11,$12,$13);

data/bin/{Image-ExifTool-10.40 → Image-ExifTool-10.43}/lib/Image/ExifTool/IPTC.pm

@@ -15,7 +15,7 @@ use strict;
 use vars qw($VERSION $AUTOLOAD %iptcCharset);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.53';
+$VERSION = '1.54';
 
 %iptcCharset = (
     "\x1b%G"  => 'UTF8',
@@ -1073,11 +1073,18 @@ sub ProcessIPTC($$$)
                 }
                 $et->FoundTag('CurrentIPTCDigest', $md5);
             }
-        } elsif ($Image::ExifTool::MWG::strict and $$et{FILE_TYPE} =~ /^(JPEG|TIFF|PSD)$/) {
-            # ignore non-standard IPTC while in strict MWG compatibility mode
-            $et->Warn("Ignored non-standard IPTC at $path");
-            return 1;
         } else {
+            if (($Image::ExifTool::MWG::strict or $et->Options('Validate')) and 
+                $$et{FILE_TYPE} =~ /^(JPEG|TIFF|PSD)$/)
+            {
+                if ($Image::ExifTool::MWG::strict) {
+                    # ignore non-standard IPTC while in strict MWG compatibility mode
+                    $et->Warn("Ignored non-standard IPTC at $path");
+                    return 1;
+                } else {
+                    $et->Warn("Non-standard IPTC at $path", 1);
+                }
+            }
             # extract non-standard IPTC
             my $count = ($$et{DIR_COUNT}{IPTC} || 0) + 1;  # count non-standard IPTC
             $$et{DIR_COUNT}{IPTC} = $count;

data/bin/{Image-ExifTool-10.40 → Image-ExifTool-10.43}/lib/Image/ExifTool/PDF.pm

@@ -21,13 +21,14 @@ use vars qw($VERSION $AUTOLOAD $lastFetched);
 use Image::ExifTool qw(:DataAccess :Utils);
 require Exporter;
 
-$VERSION = '1.41';
+$VERSION = '1.42';
 
 sub FetchObject($$$$);
 sub ExtractObject($$;$$);
 sub ReadToNested($;$);
 sub ProcessDict($$$$;$$);
 sub ProcessAcroForm($$$$;$$);
+sub ExpandArray($);
 sub ReadPDFValue($);
 sub CheckPDF($$$);
 
@@ -1703,6 +1704,22 @@ sub ProcessAcroForm($$$$;$$)
     return ProcessDict($et, $tagTablePtr, $dict, $xref, $nesting, $type);
 }
 
+#------------------------------------------------------------------------------
+# Expand array into a string
+# Inputs: 0) array ref
+# Return: string
+sub ExpandArray($)
+{
+    my $val = shift;
+    my @list = @$val;
+    foreach (@list) {
+        ref $_ eq 'SCALAR' and $_ = "ref($$_)", next;
+        ref $_ eq 'ARRAY' and $_ = ExpandArray($_), next;
+        defined $_ or $_ = '<undef>', next;
+    }
+    return '[' . join(',',@list) . ']';
+}
+
 #------------------------------------------------------------------------------
 # Process PDF dictionary extract tag values
 # Inputs: 0) ExifTool object reference, 1) tag table reference
@@ -1823,14 +1840,7 @@ sub ProcessDict($$$$;$$)
                     SubDirectory => { TagTable => 'Image::ExifTool::PDF::Unknown' },
                 };
             } else {
-                if (ref $val eq 'ARRAY') {
-                    my @list = @$val;
-                    foreach (@list) {
-                        $_ = "ref($$_)" if ref $_ eq 'SCALAR';
-                        $_ = '<undef>' unless defined $_;
-                    }
-                    $val2 = '[' . join(',',@list) . ']';
-                }
+                $val2 = ExpandArray($val) if ref $val eq 'ARRAY';
                 # generate tag info if we will use it later
                 if (not $tagInfo and defined $val and $unknown) {
                     $tagInfo = NewPDFTag($tagTablePtr, $tag);