This fixes CVE-2015-0231, CVE-2015-2305 and CVE-2015-2331. Signed-off-by: Michael Heimpold <mhei@heimpold.de>