Merge "fix CVE-2017-0479 poc"