Second patch needed for CVE-2015-7942 fix