diff options
author | Luca Milanesio <luca.milanesio@gmail.com> | 2016-11-10 17:35:22 +0000 |
---|---|---|
committer | Luca Milanesio <luca.milanesio@gmail.com> | 2016-11-14 05:04:14 -0800 |
commit | 650769c46b9d5cdad12937158e787b64be2bc41c (patch) | |
tree | 16d89d89b3e83dfad09070ee27d53eaf6b0451a0 | |
parent | 3b23e70729038dc3e1f349703ffb03382d8ac8af (diff) |
Fix NPE when requesting invalid Change-Id to index
When an invalid Change-Id containing a comma ',' is provided to the
SSH gerrit index changes command, it does not blow up and instead
returns an "Invalid change ID" error and exit code 2.
Change-Id: I97e888e372eb886b9ac9815791a7a725802d736f
Bug: Issue 4911
-rw-r--r-- | gerrit-sshd/src/main/java/com/google/gerrit/sshd/ChangeArgumentParser.java | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/ChangeArgumentParser.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/ChangeArgumentParser.java index 7f95471d75..db5f3aafc2 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/ChangeArgumentParser.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/ChangeArgumentParser.java @@ -96,9 +96,9 @@ public class ChangeArgumentParser { } private List<ChangeControl> changeFromNotesFactory(String id, - final CurrentUser currentUser) throws OrmException { + final CurrentUser currentUser) throws OrmException, UnloggedFailure { List<ChangeNotes> changes = - changeNotesFactory.create(db, Arrays.asList(Change.Id.parse(id))); + changeNotesFactory.create(db, parseId(id)); return FluentIterable.from(changes) .transform(new Function<ChangeNotes, ChangeControl>() { @Override @@ -108,6 +108,14 @@ public class ChangeArgumentParser { }).filter(Predicates.notNull()).toList(); } + private List<Change.Id> parseId(String id) throws UnloggedFailure { + try { + return Arrays.asList(new Change.Id(Integer.parseInt(id))); + } catch (NumberFormatException e) { + throw new UnloggedFailure(2, "Invalid change ID " + id, e); + } + } + private ChangeControl controlForChange(ChangeNotes change, CurrentUser user) { try { return changeControlFactory.controlFor(change, user); |