| commit | 29ae1df65253b9500ea6845373d76a9a7a4c33f8 | [log] [tgz] |
|---|---|---|
| author | Andrew Gvozdev <angvoz.dev@gmail.com> | Mon Sep 19 13:59:48 2016 -0400 |
| committer | Andrew Gvozdev <angvoz.dev@gmail.com> | Thu Sep 22 13:56:06 2016 -0400 |
| tree | cc9841a645bfbd03866a00e540b0a64af115968f | |
| parent | 149e41fd466429497125c03c81044c883d81a64a [diff] |
Bug 491286: Fixed NPE opening page C++ Build Variables in Properties/Preferences Change-Id: I5ed71665980936a3000a987a75bf2f2c962027ec
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 33af789..a74254d 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 @@ } private static boolean isTextList(String str, String delimiter) { - if (delimiter == null || delimiter.isEmpty()) + if (str == null || delimiter == null || delimiter.isEmpty()) return false; // Regex: ([^:]+:)+[^:]*