fix outer variables reported by cppcheck

Authored by cgilles on Dec 2 2019, 4:40 AM.