[P21.4] Fix for CVE-2009-2688