Static code analysis fixes #5224

Job	Run time
make check (--verbose --enable-all --disable-all-osp --disable-opensslall --enable-opensslcoexist...	2m 14s
make check (--verbose --enable-all --disable-all-osp --disable-opensslall --enable-opensslcoexist...	2m 27s
	4m 41s

Provide feedback