security: fix CVE-2021-38297 [1.16 backport] #48799
Description
@rolandshoemaker requested issue #48797 to be considered for backport to the next 1.16 minor release.
@gopherbot please backport to 1.16 and 1.17.
This is a security issue.
{{ message }}