[file/f20] (4 commits) ...fix potential memory leak introduced in previous commit

[Jan Kaluža]

Summary of changes:

  ed1f0b1... fix #1065837 - fix for CVE-2014-1943 (*)
  e5bf395... fix #1065837 - fix for CVE-2014-1943 (*)
  bae1022... fix potential memory leak introduced in previous commit (*)
  639f55a... fix potential memory leak introduced in previous commit

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