From 4a2a46a8fe1280fe381607e05e9c8485d2cc2272 Mon Sep 17 00:00:00 2001 From: firewave Date: Wed, 25 Dec 2024 16:58:15 +0100 Subject: [PATCH] CheckStl: granulized some checks in `checkIteratorPair()` to bail out early --- lib/checkstl.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/checkstl.cpp b/lib/checkstl.cpp index a81b56c3e18..e26e7a16e7a 100644 --- a/lib/checkstl.cpp +++ b/lib/checkstl.cpp @@ -799,8 +799,12 @@ bool CheckStl::checkIteratorPair(const Token* tok1, const Token* tok2) return false; } const Token* iter1 = getIteratorExpression(tok1); + if (!iter1) + return false; const Token* iter2 = getIteratorExpression(tok2); - if (iter1 && iter2 && !isSameIteratorContainerExpression(iter1, iter2, *mSettings)) { + if (!iter2) + return false; + if (!isSameIteratorContainerExpression(iter1, iter2, *mSettings)) { mismatchingContainerExpressionError(iter1, iter2); return true; }