From 29ae1df65253b9500ea6845373d76a9a7a4c33f8 Mon Sep 17 00:00:00 2001 From: Andrew Gvozdev Date: Mon, 19 Sep 2016 13:59:48 -0400 Subject: [PATCH] Bug 491286: Fixed NPE opening page C++ Build Variables in Properties/Preferences Change-Id: I5ed71665980936a3000a987a75bf2f2c962027ec --- .../internal/core/cdtvariables/EnvironmentVariableSupplier.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/cdtvariables/EnvironmentVariableSupplier.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/cdtvariables/EnvironmentVariableSupplier.java index 33af789267f..a74254d8f5a 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/cdtvariables/EnvironmentVariableSupplier.java +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/cdtvariables/EnvironmentVariableSupplier.java @@ -101,7 +101,7 @@ public class EnvironmentVariableSupplier extends CoreMacroSupplierBase { } private static boolean isTextList(String str, String delimiter) { - if (delimiter == null || delimiter.isEmpty()) + if (str == null || delimiter == null || delimiter.isEmpty()) return false; // Regex: ([^:]+:)+[^:]*