0183ef8e89
Fix issues 1 through 5 from GHSL-2021-050
(cherry picked from commit fe8cf29cad)
Signed-off-by: Joshua M. Boniface <joshua@boniface.me>