Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Gvozdev2015-01-06 15:04:34 +0000
committerAndrew Gvozdev2015-01-09 21:53:29 +0000
commitdaa20f98b46843d6c64c7b4aa42e402dfb3ea157 (patch)
tree2709fe21af0e18743ddacc2ad3aea6614a7ed08c
parent765d9bf16e72ed486768cfef2aa24154fee42d47 (diff)
downloadorg.eclipse.cdt-daa20f98b46843d6c64c7b4aa42e402dfb3ea157.tar.gz
org.eclipse.cdt-daa20f98b46843d6c64c7b4aa42e402dfb3ea157.tar.xz
org.eclipse.cdt-daa20f98b46843d6c64c7b4aa42e402dfb3ea157.zip
Bug 453398: NPE in SupplierBasedCdtVariableSubstitutor ("Expand
env.variable refs") Change-Id: I4ff9f5191ac5ffe5e5b34b8aba7758aa4965b213 Signed-off-by: Andrew Gvozdev <angvoz.dev@gmail.com> Reviewed-on: https://git.eclipse.org/r/39047 Reviewed-by: Sergey Prigogin <eclipse.sprigogin@gmail.com> Reviewed-by: Doug Schaefer <dschaefer@qnx.com> Tested-by: Hudson CI
-rw-r--r--core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/cdtvariables/SupplierBasedCdtVariableSubstitutor.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/cdtvariables/SupplierBasedCdtVariableSubstitutor.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/cdtvariables/SupplierBasedCdtVariableSubstitutor.java
index ff128c1e4d9..87f3085594e 100644
--- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/cdtvariables/SupplierBasedCdtVariableSubstitutor.java
+++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/cdtvariables/SupplierBasedCdtVariableSubstitutor.java
@@ -285,7 +285,11 @@ public class SupplierBasedCdtVariableSubstitutor implements IVariableSubstitutor
}
protected ResolvedMacro resolveMacro(String macroName) throws CdtVariableException{
- return resolveMacro(SupplierBasedCdtVariableManager.getVariable(macroName,fContextInfo,true));
+ ICdtVariable variable = SupplierBasedCdtVariableManager.getVariable(macroName,fContextInfo,true);
+ if (variable == null)
+ return null;
+
+ return resolveMacro(variable);
}
protected ResolvedMacro resolveParentMacro(MacroDescriptor macroDes) throws CdtVariableException{

Back to the top