Fix 10331: wrong conditional value after assignment+return#3461

danmar merged 2 commits intocppcheck-opensource:maincppcheck-opensource/cppcheck:mainfrom

pfultz2:fp-conditional-gotopfultz2/cppcheck:fp-conditional-gotoCopy head branch name to clipboard