[fish/f21] (2 commits) ...Fix the fixes

[amluto]

Summary of changes:

  4de0b65... Improve fixes for CVE-2014-2905 and CVE-2014-2914 (*)
  3386c6f... Fix the fixes (*)

(*) This commit already existed in another branch; no separate mail sent