Fix some CWE-252 coverity warnings
release-2.x.y
2014-05-06, Tomasz Wasilczyk