<!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>[50356] Filesystem API: Make sure to only call `fread()` on non-empty files in the PclZip library.</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/50356">50356</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/50356","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-02-16 18:46:21 +0000 (Tue, 16 Feb 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 the PclZip library.
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.
Props yakimun, fierevere, jrf, DavidAnderson, SergeyBiryukov.
Merges <a href="https://core.trac.wordpress.org/changeset/50355">[50355]</a> to the 5.6 branch.
Fixes <a href="https://core.trac.wordpress.org/ticket/52018">#52018</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches56srcwpadminincludesclasspclzipphp">branches/5.6/src/wp-admin/includes/class-pclzip.php</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#branches56">branches/5.6/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<span class="cx" style="display: block; padding: 0 10px">Index: branches/5.6
</span><span class="cx" style="display: block; padding: 0 10px">===================================================================
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">--- branches/5.6 2021-02-16 18:40:29 UTC (rev 50355)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+++ branches/5.6 2021-02-16 18:46:21 UTC (rev 50356)
</ins><a id="branches56"></a>
<div class="propset"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Property changes: branches/5.6</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: svn:mergeinfo</h4></div>
<span class="cx" style="display: block; padding: 0 10px"> /branches/4.9:43557,43622
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/5.0:43681-43682,43684-43688,43719-43720,43723,43726-43727,43729-43731,43734-43744,43747,43751-43754,43758,43760-43765,43767-43770,43772,43774-43781,43783,43785,43790-43806,43808-43821,43825,43828,43830-43834,43836-43843,43846-43863,43867-43889,43891-43894,43897-43905,43908-43909,43911-43929,43931-43942,43946-43947,43949-43956,43959-43964,43967-43969,43988,43994,44014,44017,44047,44183,44185,44187-44206,44208-44213,44231-44232,44235,44248,44284,44287-44288
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/5.5:49373-49379,49381
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/trunk:49645,49649-49651,49668,49673-49674,49677,49681,49685,49691,49702-49705,49708-49710,49713,49716,49718,49720,49722,49725-49726,49731,49736-49737,49739,49741,49744,49746,49751-49752,49759,49761-49764,49770,49772,49774,49779,49781-49784,49786,49791,49793-49795,49798-49801,49803-49805,49807,49823,49825-49826,49836,49838,49854,49860,49864-49866,49870,49872-49873,49876,49911,49913,49917,49919-49922,49938,49951-49952,49979,50003,50006,50035,50037,50039,50041,50049,50051,50053,50055,50058,50126,50176,50185,50192,50268,50285,50298
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/trunk:49645,49649-49651,49668,49673-49674,49677,49681,49685,49691,49702-49705,49708-49710,49713,49716,49718,49720,49722,49725-49726,49731,49736-49737,49739,49741,49744,49746,49751-49752,49759,49761-49764,49770,49772,49774,49779,49781-49784,49786,49791,49793-49795,49798-49801,49803-49805,49807,49823,49825-49826,49836,49838,49854,49860,49864-49866,49870,49872-49873,49876,49911,49913,49917,49919-49922,49938,49951-49952,49979,50003,50006,50035,50037,50039,50041,50049,50051,50053,50055,50058,50126,50176,50185,50192,50268,50285,50298,50355
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="branches56srcwpadminincludesclasspclzipphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.6/src/wp-admin/includes/class-pclzip.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.6/src/wp-admin/includes/class-pclzip.php 2021-02-16 18:40:29 UTC (rev 50355)
+++ branches/5.6/src/wp-admin/includes/class-pclzip.php 2021-02-16 18:46:21 UTC (rev 50356)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3884,7 +3884,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 compressed file in a buffer (one shot)
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $v_buffer = @fread($this->zip_fd, $p_entry['compressed_size']);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $p_entry['compressed_size'] > 0 ) {
+ $v_buffer = @fread($this->zip_fd, $p_entry['compressed_size']);
+ }
+ else {
+ $v_buffer = false;
+ }
</ins><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="cx" style="display: block; padding: 0 10px"> $v_file_content = @gzinflate($v_buffer);
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4096,7 +4101,12 @@
</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">- $v_buffer = @fread($this->zip_fd, $p_entry['compressed_size']);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $p_entry['compressed_size'] > 0 ) {
+ $v_buffer = @fread($this->zip_fd, $p_entry['compressed_size']);
+ }
+ else {
+ $v_buffer = false;
+ }
</ins><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="cx" style="display: block; padding: 0 10px"> echo $v_buffer;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4105,7 +4115,12 @@
</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">- $v_buffer = @fread($this->zip_fd, $p_entry['compressed_size']);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $p_entry['compressed_size'] > 0 ) {
+ $v_buffer = @fread($this->zip_fd, $p_entry['compressed_size']);
+ }
+ else {
+ $v_buffer = false;
+ }
</ins><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="cx" style="display: block; padding: 0 10px"> $v_file_content = gzinflate($v_buffer);
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4209,12 +4224,22 @@
</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">- $p_string = @fread($this->zip_fd, $p_entry['compressed_size']);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $p_entry['compressed_size'] > 0 ) {
+ $p_string = @fread($this->zip_fd, $p_entry['compressed_size']);
+ }
+ else {
+ $p_string = false;
+ }
</ins><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">- $v_data = @fread($this->zip_fd, $p_entry['compressed_size']);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $p_entry['compressed_size'] > 0 ) {
+ $v_data = @fread($this->zip_fd, $p_entry['compressed_size']);
+ }
+ else {
+ $v_data = false;
+ }
</ins><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="cx" style="display: block; padding: 0 10px"> if (($p_string = @gzinflate($v_data)) === FALSE) {
</span></span></pre>
</div>
</div>
</body>
</html>