From b96b1db015b325adc75482933fa1a24ff88ff1e4 Mon Sep 17 00:00:00 2001 From: Dion Hulse Date: Mon, 9 Mar 2015 04:31:21 +0000 Subject: [PATCH] SSH2 Upgrade transport: Trim the trailing newline character from the ouput of `pwd` to avoid a PHP Segfault. Fixes #30802 for trunk. git-svn-id: https://develop.svn.wordpress.org/trunk@31686 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-admin/includes/class-wp-filesystem-ssh2.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/wp-admin/includes/class-wp-filesystem-ssh2.php b/src/wp-admin/includes/class-wp-filesystem-ssh2.php index 294440dec9..0de635481a 100644 --- a/src/wp-admin/includes/class-wp-filesystem-ssh2.php +++ b/src/wp-admin/includes/class-wp-filesystem-ssh2.php @@ -184,8 +184,9 @@ class WP_Filesystem_SSH2 extends WP_Filesystem_Base { public function cwd() { $cwd = $this->run_command('pwd'); - if ( $cwd ) - $cwd = trailingslashit($cwd); + if ( $cwd ) { + $cwd = trailingslashit( trim( $cwd ) ); + } return $cwd; }