motiejus
/
jgit
1
Fork 0
Code Releases Activity

[spotbugs] Fix potential NPE in OpenSshServerKeyDatabase 

If oldLine is null #updateModifiedServerKey shouldn't be called since it
would derefence it. Spotbugs raised this as problem
RCN_REDUNDANT_NULLCHECK_WOULD_HAVE_BEEN_A_NPE. Fix it by checking if
oldLine is null before calling #updateModifiedServerKey.

Change-Id: I8a2000492986e52ce7dbe25f48b321c05fd371e4
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
This commit is contained in:
Matthias Sohn 2020-12-05 00:23:15 +01:00
parent bceb202319
commit 50f0347ea3
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/OpenSshServerKeyDatabase.java
View File

@ -346,11 +346,14 @@ private void updateModifiedServerKey(PublicKey serverKey,
throws IOException {
KnownHostEntry hostEntry = entry.getHostEntry();
String oldLine = hostEntry.getConfigLine();
if (oldLine == null) {
return;
}
String newLine = updateHostKeyLine(oldLine, serverKey);
if (newLine == null || newLine.isEmpty()) {
return;
}
if (oldLine == null || oldLine.isEmpty() || newLine.equals(oldLine)) {
if (oldLine.isEmpty() || newLine.equals(oldLine)) {
// Shouldn't happen.
return;
}