exiftool-vendored.pl 12.67.0 → 12.70.0

package/bin/lib/Image/ExifTool/PNG.pm

@@ -36,7 +36,7 @@ use strict;
 use vars qw($VERSION $AUTOLOAD %stdCase);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.64';
+$VERSION = '1.65';
 
 sub ProcessPNG_tEXt($$$);
 sub ProcessPNG_iTXt($$$);
@@ -80,6 +80,7 @@ my %pngMap = (
     ICC_Profile  => 'PNG',
     Photoshop    => 'PNG',
    'PNG-pHYs'    => 'PNG',
+    JUMBF        => 'PNG',
     IPTC         => 'Photoshop',
     MakerNotes   => 'ExifIFD',
 );
@@ -341,6 +342,7 @@ my %noLeapFrog = ( SAVE => 1, SEEK => 1, IHDR => 1, JHDR => 1, IEND => 1, MEND =
     },
     caBX => { # C2PA metadata
         Name => 'JUMBF',
+        Deletable => 1,
         SubDirectory => { TagTable => 'Image::ExifTool::Jpeg2000::Main' },
     },
     cICP => {

package/bin/lib/Image/ExifTool/Panasonic.pm

@@ -37,7 +37,7 @@ use vars qw($VERSION %leicaLensTypes);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 
-$VERSION = '2.18';
+$VERSION = '2.21';
 
 sub ProcessLeicaLEIC($$$);
 sub WhiteBalanceConv($;$$);
@@ -1070,18 +1070,18 @@ my %shootingMode = (
         },
     },
     # 0x71 - undef[128] (maybe text stamp text?)
+    # 0x72,0x73,0x74,0x75,0x77,0x78: 0
+    # 0x76: 0, (3 for G6 with HDR on, ref 18)
+    0x76 => { #18/21/forum15298
+        Name => 'MergedImages',
+        Writable => 'int16u',
+        Notes => 'number of images in HDR or Live View Composite picture',
+    },
     0x77 => { #18
         Name => 'BurstSpeed',
         Writable => 'int16u',
         Notes => 'images per second',
     },
-    # 0x72,0x73,0x74,0x75,0x77,0x78: 0
-    # 0x76: 0, (3 for G6 with HDR on, ref 18)
-    0x76 => { #18/21
-        Name => 'HDRShot',
-        Writable => 'int16u',
-        PrintConv => { 0 => 'Off', 3 => 'On' },
-    },
     0x79 => { #PH (GH2)
         Name => 'IntelligentD-Range',
         Writable => 'int16u',
@@ -1991,6 +1991,15 @@ my %shootingMode = (
         },
         PrintConvInv => '$_=$val; tr/A-Z0-9//dc; s/(.{3})(19|20)/$1/; $_',
     },
+    0x05ff => {
+        Name => 'CameraIFD', # (Leica Q3)
+        Condition => '$$valPt =~ /^(II\x2a\0\x08\0\0\0|MM\0\x2a\0\0\0\x08)/',
+        SubDirectory => {
+            TagTable => 'Image::ExifTool::PanasonicRaw::CameraIFD',
+            Base => '$start',
+            ProcessProc => \&Image::ExifTool::ProcessTIFF,
+        },
+    },
 );
 
 # Leica type5 ShotInfo (ref PH) (X2)
@@ -2834,10 +2843,14 @@ sub ProcessLeicaTrailer($;$)
             my $val = Image::ExifTool::Exif::RebuildMakerNotes($et, \%dirInfo, $tagTablePtr);
             unless (defined $val) {
                 $et->Warn('Error rebuilding maker notes (may be corrupt)') if $len > 4;
-                $val = $buff,
+                $val = $buff;
             }
             my $key = $et->FoundTag($tagInfo, $val);
             $et->SetGroup($key, 'ExifIFD');
+            if ($$et{MAKER_NOTE_FIXUP}) {
+                $$et{TAG_EXTRA}{$key}{Fixup} = $$et{MAKER_NOTE_FIXUP};
+                delete $$et{MAKER_NOTE_FIXUP};
+            }
         }
     }
     SetByteOrder($oldOrder);

package/bin/lib/Image/ExifTool/Pentax.pm

@@ -58,7 +58,7 @@ use Image::ExifTool::Exif;
 use Image::ExifTool::GPS;
 use Image::ExifTool::HP;
 
-$VERSION = '3.43';
+$VERSION = '3.44';
 
 sub CryptShutterCount($$);
 sub PrintFilter($$$);
@@ -556,6 +556,8 @@ my %pentaxModelID = (
     0x13240 => 'K-1 Mark II', # (Ricoh)
     0x13254 => 'K-3 Mark III', #IB (Ricoh)
     0x13290 => 'WG-70', # (Ricoh)
+    0x1329a => 'GR IIIx', # (Ricoh)
+    0x132d6 => 'K-3 Mark III Monochrome', #github226 (Ricoh)
 );
 
 # Pentax city codes - (PH, Optio WP)
@@ -971,6 +973,7 @@ my %binaryDataAttrs = (
             5 => 'Premium', #PH (K20D)
             7 => 'RAW (pixel shift enabled)', #forum6536 (K-3 II)
             8 => 'Dynamic Pixel Shift', #IB
+            9 => 'Monochrome', #github226
             65535 => 'n/a', #PH (Q MOV video)
         },
     },
@@ -2144,6 +2147,7 @@ my %binaryDataAttrs = (
             11 => 'Flat', #31 (K-70)
             # 256 - seen for GR III
             # 262 - seen for GR III
+            32768 => 'n/a',
         },
     },
     0x0050 => { #PH
@@ -2230,6 +2234,7 @@ my %binaryDataAttrs = (
             18 => '18 (KP)', #PH
             19 => '19 (GR III)', #PH
             20 => '20 (K-3III)', #PH
+            21 => '21 (K-3IIIMonochrome)', #github226
         },
     },
     0x0067 => { #PH (K-5)

package/bin/lib/Image/ExifTool/PhotoMechanic.pm

@@ -15,7 +15,7 @@ use Image::ExifTool::Exif;
 use Image::ExifTool::IPTC;
 use Image::ExifTool::XMP;
 
-$VERSION = '1.06';
+$VERSION = '1.08';
 
 sub ProcessPhotoMechanic($$);
 
@@ -138,6 +138,7 @@ my %rawCropConv = (
         ValueConv => 'Image::ExifTool::Exif::ExifTime($val)',
         ValueConvInv => 'Image::ExifTool::IPTC::IptcTime($val)',
     },
+    CreatorIdentity => { List => 'Seq' },
 );
 
 #------------------------------------------------------------------------------

package/bin/lib/Image/ExifTool/QuickTime.pm

@@ -48,7 +48,7 @@ use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 use Image::ExifTool::GPS;
 
-$VERSION = '2.87';
+$VERSION = '2.89';
 
 sub ProcessMOV($$;$);
 sub ProcessKeys($$$);
@@ -638,6 +638,33 @@ my %isImageData = ( av01 => 1, avc1 => 1, hvc1 => 1, lhv1 => 1, hvt1 => 1 );
             Condition => '$$valPt=~/^\xef\xe1\x58\x9a\xbb\x77\x49\xef\x80\x95\x27\x75\x9e\xb1\xdc\x6f/ and $$self{OPTIONS}{ExtractEmbedded}',
             SubDirectory => { TagTable => 'Image::ExifTool::QuickTime::Tags360Fly' },
         },
+        { #https://c2pa.org/specifications/
+            Name => 'JUMBF',
+            Condition => '$$valPt=~/^\xd8\xfe\xc3\xd6\x1b\x0e\x48\x3c\x92\x97\x58\x28\x87\x7e\xc4\x81.{4}manifest\0/s',
+            Deletable => 1,
+            SubDirectory => {
+                TagTable => 'Image::ExifTool::Jpeg2000::Main',
+                # 16 bytes uuid
+                # +4 bytes 0
+                # +9 bytes "manifest\0"
+                # +8 bytes absolute(!!!) offset to C2PA uuid "merkle\0" box
+                # =37 bytes total
+                Start => 37,
+            },
+        },
+        { #https://c2pa.org/specifications/ (NC)
+            Name => 'CBOR',
+            Condition => '$$valPt=~/^\xd8\xfe\xc3\xd6\x1b\x0e\x48\x3c\x92\x97\x58\x28\x87\x7e\xc4\x81.{4}merkle\0/s',
+            Deletable => 1, # (NC)
+            SubDirectory => {
+                TagTable => 'Image::ExifTool::CBOR::Main',
+                # 16 bytes uuid
+                # +4 bytes 0
+                # +7 bytes "merkle\0"
+                # =27 bytes total
+                Start => 27,
+            },
+        },
         {
             Name => 'SensorData',
             Condition => '$$valPt=~/^\xef\xe1\x58\x9a\xbb\x77\x49\xef\x80\x95\x27\x75\x9e\xb1\xdc\x6f/',
@@ -2393,6 +2420,7 @@ my %isImageData = ( av01 => 1, avc1 => 1, hvc1 => 1, lhv1 => 1, hvt1 => 1 );
         Name => 'Audible_tags',
         SubDirectory => { TagTable => 'Image::ExifTool::Audible::tags' },
     },
+    # ludt - directory containing 'tlou' tag
 );
 
 # Unknown information stored in HTC One (M8) videos - PH
@@ -2903,65 +2931,69 @@ my %isImageData = ( av01 => 1, avc1 => 1, hvc1 => 1, lhv1 => 1, hvt1 => 1 );
         Name => 'ColorPrimaries',
         Format => 'int16u',
         PrintConv => {
-                1 => 'BT.709',
-                2 => 'Unspecified',
-                4 => 'BT.470 System M (historical)',
-                5 => 'BT.470 System B, G (historical)',
-                6 => 'BT.601',
-                7 => 'SMPTE 240',
-                8 => 'Generic film (color filters using illuminant C)',
-                9 => 'BT.2020, BT.2100',
-                10 => 'SMPTE 428 (CIE 1931 XYZ)', #forum14766
-                11 => 'SMPTE RP 431-2',
-                12 => 'SMPTE EG 432-1',
-                22 => 'EBU Tech. 3213-E',
-            },
+            1 => 'BT.709',
+            2 => 'Unspecified',
+            4 => 'BT.470 System M (historical)',
+            5 => 'BT.470 System B, G (historical)',
+            6 => 'BT.601',
+            7 => 'SMPTE 240',
+            8 => 'Generic film (color filters using illuminant C)',
+            9 => 'BT.2020, BT.2100',
+            10 => 'SMPTE 428 (CIE 1931 XYZ)', #forum14766
+            11 => 'SMPTE RP 431-2',
+            12 => 'SMPTE EG 432-1',
+            22 => 'EBU Tech. 3213-E',
+        },
     },
     6 => {
         Name => 'TransferCharacteristics',
         Format => 'int16u',
         PrintConv => {
-                0 => 'For future use (0)',
-                1 => 'BT.709',
-                2 => 'Unspecified',
-                3 => 'For future use (3)',
-                4 => 'BT.470 System M (historical)',    # Gamma 2.2? (ref forum14960)
-                5 => 'BT.470 System B, G (historical)', # Gamma 2.8? (ref forum14960)
-                6 => 'BT.601',
-                7 => 'SMPTE 240 M',
-                8 => 'Linear',
-                9 => 'Logarithmic (100 : 1 range)',
-                10 => 'Logarithmic (100 * Sqrt(10) : 1 range)',
-                11 => 'IEC 61966-2-4',
-                12 => 'BT.1361',
-                13 => 'sRGB or sYCC',
-                14 => 'BT.2020 10-bit systems',
-                15 => 'BT.2020 12-bit systems',
-                16 => 'SMPTE ST 2084, ITU BT.2100 PQ',
-                17 => 'SMPTE ST 428',
-                18 => 'BT.2100 HLG, ARIB STD-B67',
-            },
+            0 => 'For future use (0)',
+            1 => 'BT.709',
+            2 => 'Unspecified',
+            3 => 'For future use (3)',
+            4 => 'BT.470 System M (historical)',    # Gamma 2.2? (ref forum14960)
+            5 => 'BT.470 System B, G (historical)', # Gamma 2.8? (ref forum14960)
+            6 => 'BT.601',
+            7 => 'SMPTE 240 M',
+            8 => 'Linear',
+            9 => 'Logarithmic (100 : 1 range)',
+            10 => 'Logarithmic (100 * Sqrt(10) : 1 range)',
+            11 => 'IEC 61966-2-4',
+            12 => 'BT.1361',
+            13 => 'sRGB or sYCC',
+            14 => 'BT.2020 10-bit systems',
+            15 => 'BT.2020 12-bit systems',
+            16 => 'SMPTE ST 2084, ITU BT.2100 PQ',
+            17 => 'SMPTE ST 428',
+            18 => 'BT.2100 HLG, ARIB STD-B67',
+        },
     },
     8 => {
         Name => 'MatrixCoefficients',
         Format => 'int16u',
         PrintConv => {
-                0 => 'Identity matrix',
-                1 => 'BT.709',
-                2 => 'Unspecified',
-                3 => 'For future use (3)',
-                4 => 'US FCC 73.628',
-                5 => 'BT.470 System B, G (historical)',
-                6 => 'BT.601',
-                7 => 'SMPTE 240 M',
-                8 => 'YCgCo',
-                9 => 'BT.2020 non-constant luminance, BT.2100 YCbCr',
-                10 => 'BT.2020 constant luminance',
-                11 => 'SMPTE ST 2085 YDzDx',
-                12 => 'Chromaticity-derived non-constant luminance',
-                13 => 'Chromaticity-derived constant luminance',
-                14 => 'BT.2100 ICtCp',
-            },
+            0 => 'Identity matrix',
+            1 => 'BT.709',
+            2 => 'Unspecified',
+            3 => 'For future use (3)',
+            4 => 'US FCC 73.628',
+            5 => 'BT.470 System B, G (historical)',
+            6 => 'BT.601',
+            7 => 'SMPTE 240 M',
+            8 => 'YCgCo',
+            9 => 'BT.2020 non-constant luminance, BT.2100 YCbCr',
+            10 => 'BT.2020 constant luminance',
+            11 => 'SMPTE ST 2085 YDzDx',
+            12 => 'Chromaticity-derived non-constant luminance',
+            13 => 'Chromaticity-derived constant luminance',
+            14 => 'BT.2100 ICtCp',
+        },
+    },
+    10 => {
+        Name => 'VideoFullRangeFlag',
+        Mask => 0x80,
     },
 );
 
@@ -6399,6 +6431,8 @@ my %isImageData = ( av01 => 1, avc1 => 1, hvc1 => 1, lhv1 => 1, hvt1 => 1 );
         Writable => 'int8s', #27
         PrintConv => { 0 => 'No', 1 => 'Yes' },
     },
+    ownr => 'Owner', #PH (obscure) (ref ChrisAdan private communication)
+    'xid ' => 'ISRC', #PH
 );
 
 # tag decoded from timed face records
@@ -7663,7 +7697,7 @@ my %isImageData = ( av01 => 1, avc1 => 1, hvc1 => 1, lhv1 => 1, hvt1 => 1 );
         SubDirectory => { TagTable => 'Image::ExifTool::QuickTime::Rights' },
     },
     name => { Name => 'UserName', Groups => { 2 => 'Author' } },
-    # chtb
+    # chtb - seen 632 bytes of random data
     # priv - private data
     # sign
     # adkm - Adobe DRM key management system (ref http://download.macromedia.com/f4v/video_file_format_spec_v10_1.pdf)
@@ -7686,6 +7720,9 @@ my %isImageData = ( av01 => 1, avc1 => 1, hvc1 => 1, lhv1 => 1, hvt1 => 1 );
     },
     medi => 'MediaFlags', #PH (?)
     mode => 'ModeFlags', #PH (?) 0x04 is HD flag (https://compilr.com/heksesang/requiem-mac/UnDrm.java)
+    # sing - seen 4 zeros
+    # hi32 - seen "00 00 00 04"
+    
 );
 
 # MP4 hint sample description box (ref 5)
@@ -9492,9 +9529,9 @@ sub ProcessMOV($$;$)
             $et->HandleTag($tagTablePtr, "$tag-offset", $raf->Tell()) if $$tagTablePtr{"$tag-offset"};
         }
         # stop processing at mdat/idat if -fast2 is used
-        last if $fast > 1 and ($tag eq 'mdat' or $tag eq 'idat');
+        last if $fast > 1 and ($tag eq 'mdat' or ($tag eq 'idat' and $$et{FileType} ne 'HEIC'));
         # load values only if associated with a tag (or verbose) and not too big
-        if ($size > 0x2000000) {    # start to get worried above 32 MB
+        if ($size > 0x2000000) {    # start to get worried above 32 MiB
             # check for RIFF trailer (written by Auto-Vox dashcam)
             if ($buff =~ /^(gpsa|gps0|gsen|gsea)...\0/s) { # (yet seen only gpsa as first record)
                 $et->VPrint(0, "Found RIFF trailer");
@@ -9511,9 +9548,9 @@ sub ProcessMOV($$;$)
             if ($tagInfo and not $$tagInfo{Unknown} and not $eeTag) {
                 my $t = PrintableTagID($tag,2);
                 if ($size > 0x8000000) {
-                    $et->Warn("Skipping '${t}' atom > 128 MB", 1);
+                    $et->Warn("Skipping '${t}' atom > 128 MiB", 1);
                 } else {
-                    $et->Warn("Skipping '${t}' atom > 32 MB", 2) or $ignore = 0;
+                    $et->Warn("Skipping '${t}' atom > 32 MiB", 2) or $ignore = 0;
                 }
             }
         }

package/bin/lib/Image/ExifTool/README

@@ -343,9 +343,10 @@ numerical, and generated automatically otherwise.
                   but applied automatically to individual tags.  Value specifies
                   pattern for split, or 1 for default pattern ',?\\s+'.
 
-                  'Avoid' - avoid creating this tag if possible.  This is only
-                  effective if another tag exists with the same name.  Setting
-                  this flag also sets the default Priority to 0 for this tag.
+                  'Avoid' - avoid creating this tag when writing if possible. 
+                  This is only effective if another tag exists with the same
+                  name.  Setting this flag also sets the default Priority to 0
+                  for this tag.
 
                   'Binary' - set to 1 for binary data.  This has the same effect
                   as setting ValueConv to '\$val', but it it a bit cleaner and
@@ -615,9 +616,9 @@ numerical, and generated automatically otherwise.
                   arguments: the value, a flag which is set for the inverse
                   conversion, and a reference to the PrintConv hash, and returns
                   the converted value or undef on error -- it may call warn() to
-                  return an error message. The lookup hash may also contain a
+                  return an error message.  The lookup hash may also contain a
                   'Notes' entry which is used for documentation if the
-                  SeparateTable flag is set). In an expression, $self is a
+                  SeparateTable flag is set).  In an expression, $self is a
                   reference to the current ExifTool object, $val is the Raw
                   value, and $tag is the tag key.  The subroutine takes 2
                   arguments: the Raw value and a reference to the current
@@ -893,6 +894,11 @@ numerical, and generated automatically otherwise.
                   writing this tag.  Only needed if tag can be written to
                   groups other than the normal groups for this tag (very rare).
 
+  Deletable     : [Writable SubDirectory's only] Overrides internal test for
+                  metadata types with permanent directories (currently QuickTime
+                  and Jpeg2000), allowing the tag containing these directories
+                  to be deleted
+
   OffsetPair    : Used in EXIF table to specify the tagID for the corresponding
                   offset or length tag.
 
@@ -917,6 +923,9 @@ numerical, and generated automatically otherwise.
   FixedSize     : [EXIF only] Hack to ignore value size and use this instead.
                   Only valid if Format is also defined.
 
+  TruncateOK    : [EXIF only] Hack to demote a truncated value in an IFD to a
+                   minor error.
+
   Struct        : [XMP tags only] Reference to structure hash for structured XMP
                   tags.  See "STRUCTURES" section below for more details.  (For
                   backward compatibility, this may be a name to an entry in

package/bin/lib/Image/ExifTool/RIFF.pm

@@ -30,7 +30,7 @@ use strict;
 use vars qw($VERSION $AUTOLOAD);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.65';
+$VERSION = '1.67';
 
 sub ConvertTimecode($);
 sub ProcessSGLT($$$);
@@ -500,6 +500,11 @@ my %code2charset = (
         Name => 'OldXMP',
         Binary => 1,
     },
+    C2PA => { #https://c2pa.org/specifications/
+        Name => 'JUMBF',
+        Deletable => 1,
+        SubDirectory => { TagTable => 'Image::ExifTool::Jpeg2000::Main' },
+    },
     olym => {
         Name => 'Olym',
         SubDirectory => { TagTable => 'Image::ExifTool::Olympus::WAV' },
@@ -555,7 +560,7 @@ my %code2charset = (
         },
     },{ # (WebP) - have also seen with "Exif\0\0" header - PH
         Name => 'EXIF',
-        Condition => '$$valPt =~ /^Exif\0\0(II\x2a\0|MM\0\x2a)/ and $self->Warn("Improper EXIF header",1)',
+        Condition => '$$valPt =~ /^Exif\0\0(II\x2a\0|MM\0\x2a)/ and ($self->Warn("Improper EXIF header",1) or 1)',
         SubDirectory => {
             TagTable => 'Image::ExifTool::Exif::Main',
             ProcessProc => \&Image::ExifTool::ProcessTIFF,
@@ -570,6 +575,12 @@ my %code2charset = (
         Notes => 'WebP files',
         SubDirectory => { TagTable => 'Image::ExifTool::XMP::Main' },
     },
+   "XMP\0" => {
+        Name => 'XMP',
+        Notes => 'incorrectly written WebP files',
+        Condition => '$self->Warn("Incorrect XMP tag ID", 1) or 1',
+        SubDirectory => { TagTable => 'Image::ExifTool::XMP::Main' },
+    },
     ICCP => { #14 (WebP)
         Name => 'ICC_Profile',
         Notes => 'WebP files',
@@ -1063,7 +1074,16 @@ my %code2charset = (
     },
     1 => {
         Name => 'MaxDataRate',
-        PrintConv => 'sprintf("%.4g kB/s",$val / 1024)',
+        Notes => q{
+            converted using SI byte prefixes unles the API ByteUnit option is set to
+            "Binary"
+        },
+        PrintConv => q{
+            my ($unit, $div) = $self->Options('ByteUnit') eq 'Binary' ? ('KiB/s',1024) : ('kB/s',1000);
+            my $tmp = $val / $div;
+            $tmp > 9999 and $tmp /= $div, $unit =~ s/^./M/;
+            sprintf('%.4g %s', $tmp, $unit);
+        },
     },
   # 2 => 'PaddingGranularity',
   # 3 => 'Flags',
@@ -1983,7 +2003,7 @@ sub ProcessRIFF($$)
 {
     my ($et, $dirInfo) = @_;
     my $raf = $$dirInfo{RAF};
-    my ($buff, $buf2, $type, $mime, $err, $rf64);
+    my ($buff, $buf2, $type, $mime, $err, $rf64, $moviEnd);
     my $verbose = $et->Options('Verbose');
     my $unknown = $et->Options('Unknown');
     my $validate = $et->Options('Validate');
@@ -2017,8 +2037,34 @@ sub ProcessRIFF($$)
 # Read chunks in RIFF image
 #
     for (;;) {
+        if ($err) {
+            last unless $moviEnd;
+            # we arrived here because there was a problem parsing the movie data
+            # so seek to the end to continue processing
+            if ($moviEnd > 0x7fffffff and not $et->Options('LargeFileSupport')) {
+                $et->Warn('Possibly corrupt LIST_movi data');
+                $et->Warn('Stopped parsing at large LIST_movi chunk (LargeFileSupport not set)');
+                undef $err;
+                last;
+            }
+            if ($validate) {
+                # (must actually try to read something after seeking to detect error)
+                $raf->Seek($moviEnd-1, 0) and $raf->Read($buff, 1) == 1 or last;
+            } else {
+                $raf->Seek($moviEnd, 0) or last;
+            }
+            $pos = $moviEnd;
+            $et->Warn('Possibly corrupt LIST_movi data');
+            undef $err;
+            undef $moviEnd;
+        }
+        if ($moviEnd) {
+            $pos > $moviEnd and $err = 1, next;     # error if we parsed past the end of the movie data
+            undef $moviEnd if $pos == $moviEnd;     # parsed all movie data?
+        }
         my $num = $raf->Read($buff, 8);
         if ($num < 8) {
+            $moviEnd and $err = 1, next;
             $err = 1 if $num;
             $et->Warn('Incorrect RIFF chunk size' . " $pos vs. $riffEnd") if $validate and $pos != $riffEnd;
             last;
@@ -2029,7 +2075,7 @@ sub ProcessRIFF($$)
         $et->OverrideFileType('Extended WEBP',undef,'webp') if $tag eq 'VP8X' and $type eq 'WEBP';
         # special case: construct new tag name from specific LIST type
         if ($tag eq 'LIST') {
-            $raf->Read($buff, 4) == 4 or $err=1, last;
+            $raf->Read($buff, 4) == 4 or $err=1, next;
             $pos += 4;
             $tag .= "_$buff";
             $len -= 4;  # already read 4 bytes (the LIST type)
@@ -2038,6 +2084,7 @@ sub ProcessRIFF($$)
         }
         $et->VPrint(0, "RIFF '${tag}' chunk ($len bytes of data):\n");
         if ($len <= 0) {
+            $moviEnd and $err = 1, next;
             if ($len < 0) {
                 $et->Warn('Invalid chunk length');
             } elsif ($tag eq "\0\0\0\0") {
@@ -2068,7 +2115,7 @@ sub ProcessRIFF($$)
         my $tagInfo = $$tagTbl{$tag};
         # (in LIST_movi chunk: ##db = uncompressed DIB, ##dc = compressed DIB, ##wb = audio data)
         if ($tagInfo or (($verbose or $unknown) and $tag !~ /^(data|idx1|LIST_movi|RIFF|\d{2}(db|dc|wb))$/)) {
-            $raf->Read($buff, $len2) == $len2 or $err=1, last;
+            $raf->Read($buff, $len2) == $len2 or $err=1, next;
             if ($hash and $isImageData{$tag}) {
                 $hash->add($buff);
                 $et->VPrint(0, "$$et{INDENT}(ImageDataHash: '${tag}' chunk, $len2 bytes)\n");
@@ -2094,7 +2141,7 @@ sub ProcessRIFF($$)
             $et->Warn('Incorrect RIFF chunk size') if $validate and $pos - 8 != $riffEnd;
             $riffEnd += $len2 + 8;
             # don't read into RIFF chunk (eg. concatenated video file)
-            $raf->Read($buff, 4) == 4 or $err=1, last;  # (skip RIFF type word)
+            $raf->Read($buff, 4) == 4 or $err=1, next;  # (skip RIFF type word)
             $pos += 4;
             # extract information from remaining file as an embedded file
             $$et{DOC_NUM} = ++$$et{DOC_COUNT};
@@ -2107,18 +2154,21 @@ sub ProcessRIFF($$)
                 $et->ImageDataHash($raf, $len2, "'${tag}' chunk");
             }
             if ($tag eq 'LIST_movi' and $ee) {
-                $raf->Seek($rewind, 0) or $err = 1, last if $rewind;
+                $raf->Seek($rewind, 0) or $err = 1, next if $rewind;
+                # save end-of-movie offset so we can seek there if we get errors parsing the movie data
+                $moviEnd = $raf->Tell() + $len2;
                 next; # parse into movi chunk
             } elsif (not $rewind) {
                 if ($len > 0x7fffffff and not $et->Options('LargeFileSupport')) {
+                    $tag =~ s/([\0-\x1f\x7f-\xff])/sprintf('\\x%.2x',ord $1)/eg;
                     $et->Warn("Stopped parsing at large $tag chunk (LargeFileSupport not set)");
                     last;
                 }
                 if ($validate and $len2) {
                     # (must actually try to read something after seeking to detect error)
-                    $raf->Seek($len2-1, 1) and $raf->Read($buff, 1) == 1 or $err = 1, last;
+                    $raf->Seek($len2-1, 1) and $raf->Read($buff, 1) == 1 or $err = 1, next;
                 } else {
-                    $raf->Seek($len2, 1) or $err=1, last;
+                    $raf->Seek($len2, 1) or $err=1, next;
                 }
             }
         }