opendev/gerrit
Code Issues Proposed changes

Protect against null pointer for BaseCommand

Browse Source 
Subclasses of BaseCommand may not initialize argv field (e.g.
ScpCommand).
Recent change [1] uses argv field which may result in NPE.

This change will guard the code from such error.

[1]: https://gerrit-review.googlesource.com/c/gerrit/+/146191

Change-Id: I6dd3afa08fd696d25741b5bdec8530deac422261
Signed-off-by: Ardo Septama <aseptama@gmail.com>
This commit is contained in:
Ardo Septama 2018-01-29 11:44:17 +01:00
parent 5adfe0610f
commit dfa74b835f
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gerrit-sshd/src/main/java/com/google/gerrit/sshd/BaseCommand.java
View File

@ -414,6 +414,9 @@ public abstract class BaseCommand implements Command {
} }
private void maskSensitiveParameters() { private void maskSensitiveParameters() {
if (argv == null) {
return;
}
sensitiveParameters = cache.get(this.getClass()); sensitiveParameters = cache.get(this.getClass());
maskedArgv = new ArrayList<>(); maskedArgv = new ArrayList<>();
maskedArgv.add(commandName); maskedArgv.add(commandName);