PBuild::Zip: fix decompression reading too many bytes

openSUSE · Jan 26, 2022 · 5b6b915 · 5b6b915
1 parent 98902d1
commit 5b6b915
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/PBuild/Zip.pm b/PBuild/Zip.pm
@@ -32,8 +32,8 @@ sub readbytes {
   seek($handle, $pos, 0) || die("seek: $!\n") if defined($pos);
   my $d;
   my $r = read($handle, $d, $size);
-  die("read: $!\n") unless defined $r;
-  die("read: unexpeced EOF\n") unless $r == $size;
+  die("zip read: $!\n") unless defined $r;
+  die("zip read: unexpeced EOF ($r != $size)\n") unless $r == $size;
   return $d;
 }
 
@@ -61,6 +61,7 @@ sub extract_inflate {
     die("unexpected EOF\n") unless $csize > 0;
     my $chunksize = $csize > 65536 ? 65536 : $csize;
     my $chunk = readbytes($handle, $chunksize);
+    $csize -= $chunksize;
     my $infchunk = '';
     ($status) = $decomp->inflate($chunk, $infchunk);
     die("decompression error\n") unless $status == Compress::Raw::Zlib::Z_OK() || $status == Compress::Raw::Zlib::Z_STREAM_END();