From 65eee1c0b0fe31f63b2043883d5560a7635a67f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torbj=C3=B6rn=20Svensson?= Date: Sun, 8 Mar 2020 17:57:51 +0100 Subject: [PATCH] Bug 560636 - Fix a small potential race MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In commit f69a613d726ae03fc22b50d68503c5aa5fda982e, a check for null and 0-length array was introduced, but the checks is not reliable unless the checked value is later used. Change-Id: Ifc32b369514ee03eeea21281a7af80616531af87 Signed-off-by: Torbjörn Svensson --- .../internal/core/dom/parser/cpp/semantics/CPPSemantics.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPSemantics.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPSemantics.java index e8bb1a3e6e8..30f4ae45f02 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPSemantics.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPSemantics.java @@ -3781,7 +3781,7 @@ public class CPPSemantics { setTargetedFunctionsToUnknown(tmp); ICPPConstructor[] ctors = type.getConstructors(); if (ctors != null && ctors.length > 0) { - return CPPDeferredFunction.createForCandidates(type.getConstructors()); + return CPPDeferredFunction.createForCandidates(ctors); } else { return new ProblemBinding(typeId, ISemanticProblem.BINDING_NOT_FOUND, type.getNameCharArray());