diff options
| author | Nathan Ridge | 2018-07-08 18:27:15 +0000 |
|---|---|---|
| committer | Nathan Ridge | 2018-07-16 15:03:56 +0000 |
| commit | 3ed176d0c273b7b5e4d2ad2bb7dd56166078f858 (patch) | |
| tree | 3c68b8310b6acc0149e357afc08002ad7eda0fca /core/org.eclipse.cdt.core | |
| parent | adbaa608cb32833c944931c3811fe6897aa12727 (diff) | |
| download | org.eclipse.cdt-3ed176d0c273b7b5e4d2ad2bb7dd56166078f858.tar.gz org.eclipse.cdt-3ed176d0c273b7b5e4d2ad2bb7dd56166078f858.tar.xz org.eclipse.cdt-3ed176d0c273b7b5e4d2ad2bb7dd56166078f858.zip | |
Bug 536805 - NPE in CPPEvaluation.maybeApplyConversion()
Change-Id: I42e780f90aacf9383b722a8b82e441d4032d14e7
Diffstat (limited to 'core/org.eclipse.cdt.core')
| -rw-r--r-- | core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPEvaluation.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPEvaluation.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPEvaluation.java index d9144c8f84a..be9b4d90b20 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPEvaluation.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPEvaluation.java @@ -172,6 +172,10 @@ public abstract class CPPEvaluation implements ICPPEvaluation { */ protected static ICPPEvaluation maybeApplyConversion(ICPPEvaluation argument, IType targetType, boolean allowContextualConversion) { + if (targetType == null) { + return argument; + } + IType type = argument.getType(); // Types match - don't bother to check for conversions. |