From 12eb09f0b99028b683b28d570bc84c15b1fbd11d Mon Sep 17 00:00:00 2001 From: Martino Facchin Date: Thu, 27 Oct 2016 09:52:40 +0200 Subject: [PATCH] Fix NPE if referred core is nonexistent Fixes #5502 --- arduino-core/src/processing/app/BaseNoGui.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/arduino-core/src/processing/app/BaseNoGui.java b/arduino-core/src/processing/app/BaseNoGui.java index 482daa863..64a8313b5 100644 --- a/arduino-core/src/processing/app/BaseNoGui.java +++ b/arduino-core/src/processing/app/BaseNoGui.java @@ -162,12 +162,14 @@ public class BaseNoGui { // Add all tools dependencies from the (possibily) referenced core String core = prefs.get("build.core"); - if (core.contains(":")) { + if (core != null && core.contains(":")) { String split[] = core.split(":"); TargetPlatform referenced = BaseNoGui.getCurrentTargetPlatformFromPackage(split[0]); - ContributedPlatform referencedPlatform = indexer.getContributedPlaform(referenced); - if (referencedPlatform != null) - requiredTools.addAll(referencedPlatform.getResolvedTools()); + if (referenced != null) { + ContributedPlatform referencedPlatform = indexer.getContributedPlaform(referenced); + if (referencedPlatform != null) + requiredTools.addAll(referencedPlatform.getResolvedTools()); + } } String prefix = "runtime.tools.";