Security fix for CVE-2020-12662 and CVE-2020-12663