Fix of 2 security bugs detected by GitHub/CodeQL
Authored by: Christian Ferrari 2020-10-21
Parent: [224f5a]
Children: [d4ae73][fd772c]