Fix CVE-2010-1633 and CVE-2010-0742.