MFH: r405286

Fix multiple vulnerabilities.

PR: 204413 (based on)
Notified by: venture37@geeklan.co.uk
Security: CVE-2015-7696, CVE-2015-7697
Approved by: ports-secteam (feld)