Fortify scan reports issues

[ajanett]

Fortify scan report of this package reports issues. I will perform a pull request with fixes within a few days to correct these.