<!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>[25304] trunk/src/wp-admin/includes: WP_Filesystem: Ensure that all files are read/written correctly by verifying the return values from fwrite() and using FTP_BINARY mode (ASCII converts line endings as per the spec).</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 { 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">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/25304">25304</a></dd>
<dt>Author</dt> <dd>dd32</dd>
<dt>Date</dt> <dd>2013-09-09 02:42:52 +0000 (Mon, 09 Sep 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>WP_Filesystem: Ensure that all files are read/written correctly by verifying the return values from fwrite() and using FTP_BINARY mode (ASCII converts line endings as per the spec). See <a href="http://core.trac.wordpress.org/ticket/25237">#25237</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesclasswpfilesystemdirectphp">trunk/src/wp-admin/includes/class-wp-filesystem-direct.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpfilesystemftpextphp">trunk/src/wp-admin/includes/class-wp-filesystem-ftpext.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpfilesystemftpsocketsphp">trunk/src/wp-admin/includes/class-wp-filesystem-ftpsockets.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpfilesystemssh2php">trunk/src/wp-admin/includes/class-wp-filesystem-ssh2.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesclasswpfilesystemdirectphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/class-wp-filesystem-direct.php (25303 => 25304)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/class-wp-filesystem-direct.php 2013-09-09 01:17:17 UTC (rev 25303)
+++ trunk/src/wp-admin/includes/class-wp-filesystem-direct.php 2013-09-09 02:42:52 UTC (rev 25304)
</span><span class="lines">@@ -59,12 +59,20 @@
</span><span class="cx"> * @param int $mode (optional) The file permissions as octal number, usually 0644.
</span><span class="cx"> * @return bool False upon failure.
</span><span class="cx"> */
</span><del>- function put_contents($file, $contents, $mode = false ) {
- if ( ! ($fp = @fopen($file, 'w')) )
</del><ins>+ function put_contents( $file, $contents, $mode = false ) {
+ $fp = @fopen( $file, 'wb' );
+ if ( ! $fp )
</ins><span class="cx"> return false;
</span><del>- @fwrite($fp, $contents);
- @fclose($fp);
- $this->chmod($file, $mode);
</del><ins>+
+ $bytes_written = fwrite( $fp, $contents );
+
+ fclose( $fp );
+
+ if ( false === $bytes_written || $bytes_written != strlen( $contents ) )
+ return false;
+
+ $this->chmod( $file, $mode );
+
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx"> /**
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpfilesystemftpextphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/class-wp-filesystem-ftpext.php (25303 => 25304)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/class-wp-filesystem-ftpext.php 2013-09-09 01:17:17 UTC (rev 25303)
+++ trunk/src/wp-admin/includes/class-wp-filesystem-ftpext.php 2013-09-09 02:42:52 UTC (rev 25304)
</span><span class="lines">@@ -88,17 +88,14 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function get_contents($file, $type = '', $resumepos = 0 ) {
- if ( empty($type) )
- $type = FTP_BINARY;
-
</del><ins>+ function get_contents( $file ) {
</ins><span class="cx"> $tempfile = wp_tempnam($file);
</span><span class="cx"> $temp = fopen($tempfile, 'w+');
</span><span class="cx">
</span><span class="cx"> if ( ! $temp )
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- if ( ! @ftp_fget($this->link, $temp, $file, $type, $resumepos) )
</del><ins>+ if ( ! @ftp_fget($this->link, $temp, $file, FTP_BINARY ) )
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> fseek($temp, 0); //Skip back to the start of the file being written to
</span><span class="lines">@@ -117,16 +114,21 @@
</span><span class="cx">
</span><span class="cx"> function put_contents($file, $contents, $mode = false ) {
</span><span class="cx"> $tempfile = wp_tempnam($file);
</span><del>- $temp = fopen($tempfile, 'w+');
</del><ins>+ $temp = fopen( $tempfile, 'wb+' );
</ins><span class="cx"> if ( ! $temp )
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- fwrite($temp, $contents);
- fseek($temp, 0); //Skip back to the start of the file being written to
</del><ins>+ $bytes_written = fwrite( $temp, $contents );
+ if ( false === $bytes_written || $bytes_written != strlen( $contents ) ) {
+ fclose( $temp );
+ unlink( $tempfile );
+ return false;
+ }
</ins><span class="cx">
</span><del>- $type = $this->is_binary($contents) ? FTP_BINARY : FTP_ASCII;
- $ret = @ftp_fput($this->link, $file, $temp, $type);
</del><ins>+ fseek( $temp, 0 ); // Skip back to the start of the file being written to
</ins><span class="cx">
</span><ins>+ $ret = @ftp_fput( $this->link, $file, $temp, FTP_BINARY );
+
</ins><span class="cx"> fclose($temp);
</span><span class="cx"> unlink($tempfile);
</span><span class="cx">
</span><span class="lines">@@ -187,7 +189,7 @@
</span><span class="cx"> if ( ! $overwrite && $this->exists($destination) )
</span><span class="cx"> return false;
</span><span class="cx"> $content = $this->get_contents($source);
</span><del>- if ( false === $content)
</del><ins>+ if ( false === $content )
</ins><span class="cx"> return false;
</span><span class="cx"> return $this->put_contents($destination, $content, $mode);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpfilesystemftpsocketsphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/class-wp-filesystem-ftpsockets.php (25303 => 25304)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/class-wp-filesystem-ftpsockets.php 2013-09-09 01:17:17 UTC (rev 25303)
+++ trunk/src/wp-admin/includes/class-wp-filesystem-ftpsockets.php 2013-09-09 02:42:52 UTC (rev 25304)
</span><span class="lines">@@ -75,20 +75,16 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $this->ftp->SetType(FTP_AUTOASCII);
- $this->ftp->Passive(true);
- $this->ftp->setTimeout(FS_TIMEOUT);
</del><ins>+ $this->ftp->SetType( FTP_BINARY );
+ $this->ftp->Passive( true );
+ $this->ftp->setTimeout( FS_TIMEOUT );
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function get_contents($file, $type = '', $resumepos = 0) {
</del><ins>+ function get_contents( $file ) {
</ins><span class="cx"> if ( ! $this->exists($file) )
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- if ( empty($type) )
- $type = FTP_AUTOASCII;
- $this->ftp->SetType($type);
-
</del><span class="cx"> $temp = wp_tempnam( $file );
</span><span class="cx">
</span><span class="cx"> if ( ! $temphandle = fopen($temp, 'w+') )
</span><span class="lines">@@ -122,11 +118,14 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- fwrite($temphandle, $contents);
- fseek($temphandle, 0); //Skip back to the start of the file being written to
</del><ins>+ $bytes_written = fwrite( $temphandle, $contents );
+ if ( false === $bytes_written || $bytes_written != strlen( $contents ) ) {
+ fclose( $temphandle );
+ unlink( $temp );
+ return false;
+ }
</ins><span class="cx">
</span><del>- $type = $this->is_binary($contents) ? FTP_BINARY : FTP_ASCII;
- $this->ftp->SetType($type);
</del><ins>+ fseek( $temphandle, 0 ); // Skip back to the start of the file being written to
</ins><span class="cx">
</span><span class="cx"> $ret = $this->ftp->fput($file, $temphandle);
</span><span class="cx">
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpfilesystemssh2php"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/class-wp-filesystem-ssh2.php (25303 => 25304)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/class-wp-filesystem-ssh2.php 2013-09-09 01:17:17 UTC (rev 25303)
+++ trunk/src/wp-admin/includes/class-wp-filesystem-ssh2.php 2013-09-09 02:42:52 UTC (rev 25304)
</span><span class="lines">@@ -150,7 +150,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function get_contents($file, $type = '', $resumepos = 0 ) {
</del><ins>+ function get_contents( $file ) {
</ins><span class="cx"> $file = ltrim($file, '/');
</span><span class="cx"> return file_get_contents('ssh2.sftp://' . $this->sftp_link . '/' . $file);
</span><span class="cx"> }
</span><span class="lines">@@ -164,9 +164,12 @@
</span><span class="cx"> $file = ltrim($file, '/');
</span><span class="cx"> $ret = file_put_contents('ssh2.sftp://' . $this->sftp_link . '/' . $file, $contents);
</span><span class="cx">
</span><ins>+ if ( $ret !== strlen( $contents ) )
+ return false;
+
</ins><span class="cx"> $this->chmod($file, $mode);
</span><span class="cx">
</span><del>- return false !== $ret;
</del><ins>+ return true;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function cwd() {
</span></span></pre>
</div>
</div>
</body>
</html>