From 4e525e52ecbcce261d0470607babd7b98c05d930 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= Date: Sat, 5 Oct 2019 18:29:41 +0200 Subject: [PATCH] ExprEngine: Avoid endless recursion for struct members that have struct type --- lib/exprengine.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/exprengine.cpp b/lib/exprengine.cpp index 015aedbec..98a23e093 100644 --- a/lib/exprengine.cpp +++ b/lib/exprengine.cpp @@ -1115,9 +1115,11 @@ static ExprEngine::ValuePtr createStructVal(const Scope *structScope, bool unini continue; } } - ExprEngine::ValuePtr memberValue = createVariableValue(member, data); - if (memberValue) - structValue->member[member.name()] = memberValue; + if (member.valueType() && member.valueType()->isIntegral()) { + ExprEngine::ValuePtr memberValue = createVariableValue(member, data); + if (memberValue) + structValue->member[member.name()] = memberValue; + } } return structValue; }