Fix CVE-2020-29372 in 4.19 and 5.4