From 4601e40615090f14e527738efcc7912e42cdc327 Mon Sep 17 00:00:00 2001 From: Dmitry-Me Date: Mon, 2 Oct 2017 18:03:55 +0300 Subject: [PATCH] Simplify code for finding string format token --- lib/checkio.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/checkio.cpp b/lib/checkio.cpp index 9537a32cc..a67cc4e0a 100644 --- a/lib/checkio.cpp +++ b/lib/checkio.cpp @@ -480,8 +480,12 @@ static bool findFormat(unsigned int arg, const Token *firstArg, argTok->variable()->dimensionKnown(0) && argTok->variable()->dimension(0) != 0))) { *formatArgTok = argTok->nextArgument(); - if (!argTok->values().empty() && argTok->values().front().isTokValue() && argTok->values().front().tokvalue && argTok->values().front().tokvalue->tokType() == Token::eString) - *formatStringTok = argTok->values().front().tokvalue; + if (!argTok->values().empty()) { + const ValueFlow::Value &value = argTok->values().front(); + if (value.isTokValue() && value.tokvalue && value.tokvalue->tokType() == Token::eString) { + *formatStringTok = value.tokvalue; + } + } return true; } return false;