update to 7.2.0 GA

add upstream patch for https://bugs.php.net/75514
This commit is contained in:
Remi Collet 2017-11-28 13:25:17 +01:00
parent 45b145421b
commit 3fba584aeb
4 changed files with 65 additions and 32 deletions

32
.gitignore vendored
View File

@ -2,37 +2,9 @@ clog
*.md
php-5.6.*.xz
php-7.0.*.xz
/php-7.0.8.tar.xz
/php-7.0.9RC1.tar.xz
/php-7.0.9.tar.xz
/php-7.0.10RC1.tar.xz
/php-7.0.10.tar.xz
/php-7.0.11RC1.tar.xz
/php-7.0.11.tar.xz
/php-7.0.12RC1.tar.xz
/php-7.1.0RC6.tar.xz
/php-7.1.0.tar.xz
/php-7.1.1RC1.tar.xz
/php-7.1.1.tar.xz
/php-7.1.2RC1.tar.xz
/php-7.1.2.tar.xz
/php-7.1.3RC1.tar.xz
/php-7.1.3.tar.xz
/php-7.1.4RC1.tar.xz
/php-7.1.4.tar.xz
/php-7.1.5RC1.tar.xz
/php-7.1.5.tar.xz
/php-7.1.6RC1.tar.xz
/php-7.1.6.tar.xz
/php-7.1.7RC1.tar.xz
/php-7.1.7.tar.xz
/php-7.1.8RC1.tar.xz
/php-7.1.8.tar.xz
/php-7.1.9RC1.tar.xz
/php-7.1.9.tar.xz
/php-7.1.10RC1.tar.xz
/php-7.1.10.tar.xz
php-7.1.*.xz
/php-7.2.0RC3.tar.xz
/php-7.2.0RC4.tar.xz
/php-7.2.0RC5.tar.xz
/php-7.2.0RC6.tar.xz
/php-7.2.0.tar.xz

View File

@ -0,0 +1,55 @@
From 00500c425ba895f1b3591ace3ccd5ee125307559 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Mon, 13 Nov 2017 09:55:10 +0100
Subject: [PATCH] Fixed bug #75514 mt_rand returns value outside [$min,$max]+
on 32-bit
---
ext/standard/mt_rand.c | 4 ++--
ext/standard/tests/math/bug75514.phpt | 12 ++++++++++++
2 files changed, 14 insertions(+), 2 deletions(-)
create mode 100644 ext/standard/tests/math/bug75514.phpt
diff --git a/ext/standard/mt_rand.c b/ext/standard/mt_rand.c
index 2335a92..6669cbc 100644
--- a/ext/standard/mt_rand.c
+++ b/ext/standard/mt_rand.c
@@ -294,7 +294,7 @@ PHPAPI zend_long php_mt_rand_range(zend_long min, zend_long max)
* rand() allows min > max, mt_rand does not */
PHPAPI zend_long php_mt_rand_common(zend_long min, zend_long max)
{
- zend_long n;
+ uint32_t n;
if (BG(mt_rand_mode) == MT_RAND_MT19937) {
return php_mt_rand_range(min, max);
@@ -302,7 +302,7 @@ PHPAPI zend_long php_mt_rand_common(zend_long min, zend_long max)
/* Legacy mode deliberately not inside php_mt_rand_range()
* to prevent other functions being affected */
- n = (zend_long)php_mt_rand() >> 1;
+ n = php_mt_rand() >> 1;
RAND_RANGE_BADSCALING(n, min, max, PHP_MT_RAND_MAX);
return n;
diff --git a/ext/standard/tests/math/bug75514.phpt b/ext/standard/tests/math/bug75514.phpt
new file mode 100644
index 0000000..af97b6d
--- /dev/null
+++ b/ext/standard/tests/math/bug75514.phpt
@@ -0,0 +1,12 @@
+--TEST--
+Bug #75514 mt_rand returns value outside [$min,$max]
+--FILE--
+<?php
+mt_srand(0, MT_RAND_PHP);
+var_dump(mt_rand(0,999999999), mt_rand(0,999));
+?>
+===Done===
+--EXPECT--
+int(448865905)
+int(592)
+===Done===
--
2.9.5

View File

@ -62,7 +62,7 @@
%endif
%global upver 7.2.0
%global rcver RC6
#global rcver RC6
Summary: PHP scripting language for creating dynamic web sites
Name: php
@ -114,6 +114,7 @@ Patch46: php-7.2.0-fixheader.patch
Patch47: php-5.6.3-phpinfo.patch
# Upstream fixes (100+)
Patch100: 0001-Fixed-bug-75514-mt_rand-returns-value-outside-min-ma.patch
# Security fixes (200+)
@ -727,6 +728,7 @@ low-level PHP extension for the libsodium cryptographic library.
%patch47 -p1 -b .phpinfo
# upstream patches
%patch100 -p1 -b .upstream
# security patches
@ -1520,6 +1522,10 @@ rm -f README.{Zeus,QNX,CVS-RULES}
%changelog
* Tue Nov 28 2017 Remi Collet <remi@remirepo.net> - 7.2.0-1
- update to 7.2.0 GA
- add upstream patch for https://bugs.php.net/75514
* Tue Nov 7 2017 Remi Collet <remi@fedoraproject.org> - 7.2.0~RC6-1
- Update to 7.2.0RC6

View File

@ -1 +1 @@
SHA512 (php-7.2.0RC6.tar.xz) = 7cddd7bce3dddbe478124450f95150012dfa4376ea7a0dde7d2b1caaf9de6b44c39c60db3da6756b25c100f0f852d17cee8e13986d5e9711337388a40a6635e4
SHA512 (php-7.2.0.tar.xz) = 828d38727edde0dbc6483add6cdc21d33527b887bffaedad2d7f53e25d58a6f661ac341a23db02741bc37248d161aaffd72026dd8ef85ac851594c127d6c0133