WebSVN – Moodle – Diff – /lib/zipstream/src/File.php

+    {
         $forecastSize = $this->forecastSize();
         if ($this->enableZeroHeader) {
             // No calculation required
-        } elseif ($this->isSimulation() && $forecastSize) {
+        } elseif ($this->isSimulation() && $forecastSize !== null) {
             $this->uncompressedSize = $forecastSize;
             $this->compressedSize = $forecastSize;
         } else {
             $this->readStream(send: false);
+            }
+        }
         $this->addFileHeader();
-        $detectedSize = $forecastSize ?? $this->compressedSize;
+        $detectedSize = $forecastSize ?? ($this->compressedSize > 0 ? $this->compressedSize : null);
         if (
+            $this->isSimulation() &&
+            $detectedSize !== null
-            $this->isSimulation() &&
+        ) {
-            $detectedSize > 0
+            $this->uncompressedSize = $detectedSize;
-        ) {
+            $this->compressedSize = $detectedSize;
             ($this->recordSentBytes)($detectedSize);
     private function forecastSize(): ?int
+    {
         if ($this->compressionMethod !== CompressionMethod::STORE) {
             return null;
+        }
-        if ($this->exactSize) {
+        if ($this->exactSize !== null) {
             return $this->exactSize;
+        }
         $fstat = fstat($this->unpackStream());
         if (!$fstat || !array_key_exists('size', $fstat) || $fstat['size'] < 1) {
             return null;
         $footer = $this->buildZip64ExtraBlock($forceEnableZip64);
         $zip64Enabled = $footer !== '';
-        if($zip64Enabled) {
+        if ($zip64Enabled) {
             $this->version = Version::ZIP64;
                 self::CHUNKED_READ_BLOCK_SIZE
             );
+            $data = fread($this->unpackStream(), $readLength);
+            if ($data === false) {
+                throw new ResourceActionException('fread', $this->unpackStream());
             $data = fread($this->unpackStream(), $readLength);
             hash_update($hash, $data);
             $this->uncompressedSize += strlen($data);
             if ($deflate) {
                 $data =  deflate_add(
+                    $deflate,
+                    $data,
+                    feof($this->unpackStream()) ? ZLIB_FINISH : ZLIB_NO_FLUSH
+                );
                     $deflate,
-                    $data,
+                if ($data === false) {
-                    feof($this->unpackStream()) ? ZLIB_FINISH : ZLIB_NO_FLUSH
+                    throw new RuntimeException('deflate_add failed');
                 );
+            }
             $this->compressedSize += strlen($data);
             if ($send) {
                 ($this->send)($data);
+            }
+        }
-        if ($this->exactSize && $this->uncompressedSize !== $this->exactSize) {
+        if ($this->exactSize !== null && $this->uncompressedSize !== $this->exactSize) {
             throw new FileSizeIncorrectException(expectedSize: $this->exactSize, actualSize: $this->uncompressedSize);
+        }
         $this->crc = hexdec(hash_final($hash));
+    }
+    {
         $footer = $this->buildZip64ExtraBlock();
         return CentralDirectoryFileHeader::generate(
             versionMadeBy: ZipStream::ZIP_VERSION_MADE_BY,
-            versionNeededToExtract:$this->version->value,
+            versionNeededToExtract: $this->version->value,
             generalPurposeBitFlag: $this->generalPurposeBitFlag,
             compressionMethod: $this->compressionMethod,
             lastModificationDateTime: $this->lastModificationDateTime,
             crc32: $this->crc,

Proyectos de Subversion Moodle

(root)/lib/zipstream/src/File.php – Rev 1 → 1441