diff options
| author | Saša Živkov <sasa.zivkov@sap.com> | 2016-04-15 13:27:56 +0200 |
|---|---|---|
| committer | David Pursehouse <david.pursehouse@sonymobile.com> | 2016-04-19 01:05:18 +0000 |
| commit | 897c9b804178da4304d38a18f62cee869eae6fb9 (patch) | |
| tree | db9056ab785cb4584e24526d25c3ec21b0a4ffce | |
| parent | cc6a47b12fb0be14dcb846cdca50214711a4a526 (diff) | |
Protect the TrackingFooters.extract from null input parameter
Some code paths could pass null to the TrackingFooters.extract.
An example is [1] which happens when loading of the current patch set
of a change fails.
[1]
at com.google.gerrit.server.config.TrackingFooters.extract(TrackingFooters.java:42)
at com.google.gerrit.server.query.change.OutputStreamQuery.query(OutputStreamQuery.java:247)
...
Change-Id: I27ce4cc0d9606208a8be884646e901004171bd96
| -rw-r--r-- | gerrit-server/src/main/java/com/google/gerrit/server/config/TrackingFooters.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/TrackingFooters.java b/gerrit-server/src/main/java/com/google/gerrit/server/config/TrackingFooters.java index 6fbc2060e1..672c4613cb 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/config/TrackingFooters.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/config/TrackingFooters.java @@ -39,6 +39,10 @@ public class TrackingFooters { public Multimap<String, String> extract(List<FooterLine> lines) { Multimap<String, String> r = ArrayListMultimap.create(); + if (lines == null) { + return r; + } + for (FooterLine footer : lines) { for (TrackingFooter config : trackingFooters) { if (footer.matches(config.footerKey())) { |