<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[51686] trunk/src/wp-admin/includes/class-pclzip.php: Filesystem API: Make sure to only call `fread()` on non-empty files in `PclZip::privAddFile()`.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/51686">51686</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/51686","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2021-08-29 01:32:46 +0000 (Sun, 29 Aug 2021)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Filesystem API: Make sure to only call `fread()` on non-empty files in `PclZip::privAddFile()`.
This avoids a fatal error on PHP 8 caused by passing a zero value to `fread()` as the `$length` argument, which must be greater than zero.
This commit also amends the previous solution for similar issues elsewhere in the file to ensure consistent type for string values, instead of changing the type from `string` to `bool` when trying to read from an empty file.
Follow-up to <a href="https://core.trac.wordpress.org/changeset/50355">[50355]</a>.
Props DavidAnderson, jrf, SergeyBiryukov.
Fixes <a href="https://core.trac.wordpress.org/ticket/54036">#54036</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesclasspclzipphp">trunk/src/wp-admin/includes/class-pclzip.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesclasspclzipphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-pclzip.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-pclzip.php 2021-08-28 21:16:22 UTC (rev 51685)
+++ trunk/src/wp-admin/includes/class-pclzip.php 2021-08-29 01:32:46 UTC (rev 51686)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2674,7 +2674,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // ----- Read the file content
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $v_content = @fread($v_file, $p_header['size']);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ($p_header['size'] > 0) {
+ $v_content = @fread($v_file, $p_header['size']);
+ }
+ else {
+ $v_content = '';
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // ----- Close the file
</span><span class="cx" style="display: block; padding: 0 10px"> @fclose($v_file);
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3884,11 +3889,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // ----- Read the compressed file in a buffer (one shot)
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $p_entry['compressed_size'] > 0 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ($p_entry['compressed_size'] > 0) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $v_buffer = @fread($this->zip_fd, $p_entry['compressed_size']);
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $v_buffer = false;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $v_buffer = '';
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // ----- Decompress the file
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4101,11 +4106,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ($p_entry['compressed_size'] == $p_entry['size']) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // ----- Read the file in a buffer (one shot)
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $p_entry['compressed_size'] > 0 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ($p_entry['compressed_size'] > 0) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $v_buffer = @fread($this->zip_fd, $p_entry['compressed_size']);
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $v_buffer = false;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $v_buffer = '';
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // ----- Send the file to the output
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4115,11 +4120,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> else {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // ----- Read the compressed file in a buffer (one shot)
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $p_entry['compressed_size'] > 0 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ($p_entry['compressed_size'] > 0) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $v_buffer = @fread($this->zip_fd, $p_entry['compressed_size']);
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $v_buffer = false;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $v_buffer = '';
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // ----- Decompress the file
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4224,21 +4229,21 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ($p_entry['compression'] == 0) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // ----- Reading the file
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $p_entry['compressed_size'] > 0 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ($p_entry['compressed_size'] > 0) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $p_string = @fread($this->zip_fd, $p_entry['compressed_size']);
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p_string = false;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p_string = '';
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> else {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // ----- Reading the file
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $p_entry['compressed_size'] > 0 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ($p_entry['compressed_size'] > 0) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $v_data = @fread($this->zip_fd, $p_entry['compressed_size']);
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $v_data = false;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $v_data = '';
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // ----- Decompress the file
</span></span></pre>
</div>
</div>
</body>
</html>