rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2025-03-21 12:29:23 +01:00
Code Issues Releases Activity

Fix NPE if referred core is nonexistent

Browse Source 
Fixes #5502
This commit is contained in:
Martino Facchin 2016-10-27 09:52:40 +02:00
parent de9bd89a01
commit 12eb09f0b9
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
arduino-core/src/processing/app/BaseNoGui.java
View File

@ -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.";