Fixes CVE-2019-7317. (cherry picked from commit 225b61ab2a)
225b61ab2a
(cherry picked from commit 5a89d08e3f)
5a89d08e3f