octoleo/phpseclib
1
0
Fork 0
mirror of https://github.com/phpseclib/phpseclib.git synced 2024-12-27 03:42:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

SFTP: optimize conditional calls to fclose in get() method

Browse Source
This commit is contained in:
terrafrost 2014-08-19 14:05:24 -05:00
parent 29e0143308
commit cb66c561c2
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
phpseclib/Net/SFTP.php
View File

@ -2032,12 +2032,14 @@ class Net_SFTP extends Net_SSH2
} }
} }
$fclose_check = $local_file !== false && !is_resource($local_file);
$start = $offset; $start = $offset;
$size = $this->max_sftp_packet < $length || $length < 0 ? $this->max_sftp_packet : $length; $size = $this->max_sftp_packet < $length || $length < 0 ? $this->max_sftp_packet : $length;
while (true) { while (true) {
$packet = pack('Na*N3', strlen($handle), $handle, $offset / 4294967296, $offset, $size); $packet = pack('Na*N3', strlen($handle), $handle, $offset / 4294967296, $offset, $size);
if (!$this->_send_sftp_packet(NET_SFTP_READ, $packet)) { if (!$this->_send_sftp_packet(NET_SFTP_READ, $packet)) {
if ($local_file !== false && !is_resource($local_file)) { if ($fclose_check) {
fclose($fp); fclose($fp);
} }
return false; return false;
@ -2060,7 +2062,7 @@ class Net_SFTP extends Net_SSH2
break 2; break 2;
default: default:
user_error('Expected SSH_FXP_DATA or SSH_FXP_STATUS'); user_error('Expected SSH_FXP_DATA or SSH_FXP_STATUS');
if ($local_file !== false && !is_resource($local_file)) { if ($fclose_check) {
fclose($fp); fclose($fp);
} }
return false; return false;
@ -2079,7 +2081,7 @@ class Net_SFTP extends Net_SSH2
} }
} }
if ($local_file !== false && !is_resource($local_file)) { if ($fclose_check) {
fclose($fp); fclose($fp);
} }