Fix recent coverity-reported issues #2343

Job	Run time
cppcheck	3m 55s
code formatting check	23s
min features with gcc	7m 48s
min features with g++	2m 49s
min features with clang	9m 58s
max features with gcc	3m 33s
max features with g++	3m 22s
max features with clang	4m 33s
max features with clang and AddressSanitized	4m 2s
max features with gcc and DEBUG	4m 0s
max features with gcc for 32-bit arch (legacy OS)	2m 19s
max features with g++ for 32-bit arch (legacy OS)	2m 26s
max features with clang for 32-bit arch (legacy OS)	2m 45s
	51m 53s

Provide feedback