You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by gn...@apache.org on 2013/01/07 15:02:40 UTC
svn commit: r1429800 - in
/mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/server:
command/ScpCommand.java sftp/SftpSubsystem.java
Author: gnodet
Date: Mon Jan 7 14:02:40 2013
New Revision: 1429800
URL: http://svn.apache.org/viewvc?rev=1429800&view=rev
Log:
[SSHD-197] IOExceptions thrown from SshFile can cause NPE
Modified:
mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/server/command/ScpCommand.java
mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/server/sftp/SftpSubsystem.java
Modified: mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/server/command/ScpCommand.java
URL: http://svn.apache.org/viewvc/mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/server/command/ScpCommand.java?rev=1429800&r1=1429799&r2=1429800&view=diff
==============================================================================
--- mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/server/command/ScpCommand.java (original)
+++ mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/server/command/ScpCommand.java Mon Jan 7 14:02:40 2013
@@ -231,7 +231,7 @@ public class ScpCommand implements Comma
} catch (IOException e) {
try {
exitValue = ERROR;
- exitMessage = e.getMessage();
+ exitMessage = e.getMessage() == null ? "" : e.getMessage();
out.write(exitValue);
out.write(exitMessage.getBytes());
out.write('\n');
Modified: mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/server/sftp/SftpSubsystem.java
URL: http://svn.apache.org/viewvc/mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/server/sftp/SftpSubsystem.java?rev=1429800&r1=1429799&r2=1429800&view=diff
==============================================================================
--- mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/server/sftp/SftpSubsystem.java (original)
+++ mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/server/sftp/SftpSubsystem.java Mon Jan 7 14:02:40 2013
@@ -571,7 +571,7 @@ public class SftpSubsystem implements Co
handles.put(handle, new FileHandle(file, pflags)); // handle flags conversion
sendHandle(id, handle);
} catch (IOException e) {
- sendStatus(id, SSH_FX_FAILURE, e.getMessage());
+ sendStatus(id, SSH_FX_FAILURE, e.getMessage() == null ? "" : e.getMessage());
}
} else {
String path = buffer.getString();