]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5.32' into PHP-5.6.18
authorStanislav Malyshev <stas@php.net>
Tue, 2 Feb 2016 02:32:31 +0000 (18:32 -0800)
committerStanislav Malyshev <stas@php.net>
Tue, 2 Feb 2016 02:32:31 +0000 (18:32 -0800)
* PHP-5.5.32:
  Fixed bug #71488: Stack overflow when decompressing tar archives
  update NEWS
  add missing headers for SIZE_MAX
  backport the escapeshell* functions hardening branch
  add tests
  Fix bug #71459 - Integer overflow in iptcembed()
  Fixed bug #71323 - Output of stream_get_meta_data can be falsified by its input
  Fix bug #71391: NULL Pointer Dereference in phar_tar_setupmetadata()
  Fix bug #71335: Type Confusion in WDDX Packet Deserialization
  Fix bug #71354 - remove UMR when size is 0

14 files changed:
1  2 
ext/phar/phar_object.c
ext/phar/tar.c
ext/standard/basic_functions.c
ext/standard/exec.c
ext/standard/exec.h
ext/standard/iptc.c
ext/standard/streamsfuncs.c
ext/standard/tests/streams/stream_get_meta_data_socket_basic.phpt
ext/standard/tests/streams/stream_get_meta_data_socket_variation1.phpt
ext/standard/tests/streams/stream_get_meta_data_socket_variation2.phpt
ext/standard/tests/streams/stream_get_meta_data_socket_variation3.phpt
ext/standard/tests/streams/stream_get_meta_data_socket_variation4.phpt
ext/wddx/wddx.c
main/streams/memory.c

Simple merge
diff --cc ext/phar/tar.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc ext/wddx/wddx.c
Simple merge
Simple merge