[#8534] fix some codeql warnings
4 files changed