Apply two vendor fixes for CVE-2009-3720. Security: CVE-2009-3720
sam and phk who are the two consumers of this library. If there is any other fallout, email me and I will take care of it. Approved by: sam, phk