diff options
| author | Stanislav Malyshev <stas@php.net> | 2016-02-01 19:55:09 -0800 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2016-02-01 20:00:01 -0800 |
| commit | e231830f1683e753a4d6d107d69e4e0aa67a4be6 (patch) | |
| tree | 16cd6b146156cdb6e90b1092ecae3d42c46ab322 /main/streams/memory.c | |
| parent | 0007a695c8e6fb9c11c7167428070af980269c2f (diff) | |
| parent | 24167095a5fbc4ba6cd14ce5aa85ba000d9d4980 (diff) | |
| download | php-git-e231830f1683e753a4d6d107d69e4e0aa67a4be6.tar.gz | |
Merge branch 'PHP-5.6.18' into PHP-7.0.3
* PHP-5.6.18:
fix tests
fix NEWS
Update NEWS
update NEWS
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()
prepare 5.6.18RC1
Fix test when run with openssl < 1.0.2 (reorder so no more SSLv2 message) Fix skip message to work
improve fix for bug #71201
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()
Fixed bug #71331 - Uninitialized pointer in phar_make_dirstream()
Fix bug #71335: Type Confusion in WDDX Packet Deserialization
Fix bug #71354 - remove UMR when size is 0
Conflicts:
configure.in
ext/phar/dirstream.c
ext/phar/phar_object.c
ext/phar/tar.c
ext/standard/exec.c
ext/standard/iptc.c
ext/standard/math.c
ext/standard/streamsfuncs.c
ext/wddx/wddx.c
main/php_version.h
main/streams/memory.c
Diffstat (limited to 'main/streams/memory.c')
| -rw-r--r-- | main/streams/memory.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/main/streams/memory.c b/main/streams/memory.c index e2695ff2d9..09da047d86 100644 --- a/main/streams/memory.c +++ b/main/streams/memory.c @@ -697,7 +697,9 @@ static php_stream * php_stream_url_wrap_rfc2397(php_stream_wrapper *wrapper, con plen = sep - path; vlen = (semi ? semi - sep : mlen - plen) - 1 /* '=' */; key = estrndup(path, plen); - add_assoc_stringl_ex(&meta, key, plen, sep + 1, vlen); + if (plen != sizeof("mediatype")-1 || memcmp(key, "mediatype", sizeof("mediatype")-1)) { + add_assoc_stringl_ex(&meta, key, plen, sep + 1, vlen); + } efree(key); plen += vlen + 1; mlen -= plen; |