diff options
| author | Remi Collet <fedora@famillecollet.com> | 2016-02-16 22:54:26 +0100 |
|---|---|---|
| committer | Remi Collet <fedora@famillecollet.com> | 2016-02-16 22:54:26 +0100 |
| commit | 1ed943ec556f4bfa49a2700b30c9bb58a91379eb (patch) | |
| tree | f1e7c3c5b9d1fa3e4fe78a0c80cde04a1e0333c5 /bug71354.patch | |
| parent | 08069d1e5b43644dc9cac9bd4d645304320cc0d0 (diff) | |
php 5.4.45-4 (security fix backported from 5.5.32)
Diffstat (limited to 'bug71354.patch')
| -rw-r--r-- | bug71354.patch | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/bug71354.patch b/bug71354.patch new file mode 100644 index 0000000..7cbafc5 --- /dev/null +++ b/bug71354.patch @@ -0,0 +1,28 @@ +Backported from 5.5 for 5.4 by Remi Collet +binary patch dropped + +From 13ad4d3e971807f9a58ab5933182907dc2958539 Mon Sep 17 00:00:00 2001 +From: Stanislav Malyshev <stas@php.net> +Date: Wed, 13 Jan 2016 16:32:29 -0800 +Subject: [PATCH] Fix bug #71354 - remove UMR when size is 0 + +--- + ext/phar/phar_object.c | 1 + + ext/phar/tests/bug71354.phpt | 13 +++++++++++++ + ext/phar/tests/bug71354.tar | Bin 0 -> 1536 bytes + 3 files changed, 14 insertions(+) + create mode 100644 ext/phar/tests/bug71354.phpt + create mode 100644 ext/phar/tests/bug71354.tar + +diff --git a/ext/phar/phar_object.c b/ext/phar/phar_object.c +index 6d25509..e21a982 100644 +--- a/ext/phar/phar_object.c ++++ b/ext/phar/phar_object.c +@@ -4977,6 +4977,7 @@ PHP_METHOD(PharFileInfo, getContent) + + phar_seek_efp(link, 0, SEEK_SET, 0, 0 TSRMLS_CC); + Z_TYPE_P(return_value) = IS_STRING; ++ Z_STRVAL_P(return_value) = NULL; + Z_STRLEN_P(return_value) = php_stream_copy_to_mem(fp, &(Z_STRVAL_P(return_value)), link->uncompressed_filesize, 0); + + if (!Z_STRVAL_P(return_value)) { |