Improves fix for memory leak, keep in sync with upstream.

Previous fix:
http://git.php.net/?p=php-src.git;a=commitdiff;h=10eb0070700382f966bf260e44135e1f724a15d2

Upstream fix:
https://github.com/glensc/file/commit/c0c0032b9e9eb57b91fefef905a3b018bab492d9
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Improves fix for memory leak, keep in sync with upstream.
fix merge
Merge branch 'PHP-5.6'

* PHP-5.6:
  Improves fix for memory leak, keep in sync with upstream.
Fixed Bug #66820 out-of-bounds memory access in fileinfo

Upstream fix:
https://github.com/glensc/file/commit/447558595a3650db2886cd2f416ad0beba965801

Notice, test changed, with upstream agreement:
-define OFFSET_OOB(n, o, i)	((n) < (o) || (i) >= ((n) - (o)))
+define OFFSET_OOB(n, o, i)	((n) < (o) || (i) >  ((n) - (o)))
NEWS
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  NEWS
  Fixed Bug #66820 out-of-bounds memory access in fileinfo
NEWS
fix merge
Merge branch 'PHP-5.6'

* PHP-5.6:
  NEWS
  NEWS
  Fixed Bug #66820 out-of-bounds memory access in fileinfo
Merge branch 'master' of git://github.com/php/php-src