Merge branch 'PHP-7.1'

* PHP-7.1: news entry for calendar overflow fix Fix integer overflow in calender.
dereckson · Nov 12, 2016 · 0c76451 · 0c76451
2 parents a2bc7cf + 2d865df
commit 0c76451
Show file tree

Hide file tree

Showing 6 changed files with 71 additions and 4 deletions.
diff --git a/NEWS b/NEWS
@@ -1,6 +1,53 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-?? ??? 2016, PHP 7.2.0alpha1
+?? ??? ????, PHP 7.1
+
+- Calendar:
+  . Fix integer overflows (Joshua Rogers)
+
+10 Nov 2016, PHP 7.1.0RC6
+
+- Core:
+  . Fixded bug #72736 (Slow performance when fetching large dataset with mysqli
+    / PDO). (Dmitry)
+  . Fixed bug #72482 (Ilegal write/read access caused by gdImageAALine
+    overflow). (cmb)
+  . Fixed bug #72696 (imagefilltoborder stackoverflow on truecolor images).
+    (cmb)
+
+- Date:
+  . Fixed bug #73426 (createFromFormat with 'z' format char results in
+    incorrect time). (Derick)
+
+- IMAP:
+  . Fixed bug #73418 (Integer Overflow in "_php_imap_mail" leads to crash).
+    (Anatol)
+
+- JSON:
+  . Introduced encoder struct instead of global which fixes bugs #66025 and
+    #73254 related to pretty print indentation. (Jakub Zelenka)
+
+- ODBC:
+  . Fixed bug #73448 (odbc_errormsg returns trash, always 513 bytes).
+    (Anatol)
+
+- PCRE:
+  . Fixed bug #73392 (A use-after-free in zend allocator management). 
+    (Laruence)
+
+- PDO_Firebird:
+  . Fixed bug #73087, #61183, #71494 (Memory corruption in bindParam).
+    (Dorin Marcoci)
+
+- SPL:
+  . Fixed bug #73423 (Reproducible crash with GDB backtrace). (Laruence)
+
+- Wddx:
+  . Fixed bug #73331 (NULL Pointer Dereference in WDDX Packet Deserialization
+    with PDORow). (Stas)
+
+27 Oct 2016, PHP 7.1.0RC5
+>>>>>>> PHP-7.1
 
 - Core:
   . Removed the sql.safe_mode directive. (Kalle)

diff --git a/ext/calendar/calendar.c b/ext/calendar/calendar.c
@@ -12,7 +12,7 @@
    | obtain it through the world-wide-web, please send a note to          |
    | [email protected] so we can mail you a copy immediately.               |
    +----------------------------------------------------------------------+
-   | Authors: Shane Caraveo             <[email protected]>               | 
+   | Authors: Shane Caraveo             <[email protected]>               |
    |          Colin Viebrock            <[email protected]>               |
    |          Hartmut Holzgraefe        <[email protected]>                |
    |          Wez Furlong               <[email protected]>            |

diff --git a/ext/calendar/gregor.c b/ext/calendar/gregor.c
@@ -195,7 +195,7 @@ zend_long GregorianToSdn(
 						   int inputMonth,
 						   int inputDay)
 {
-	int year;
+	zend_long year;
 	int month;
 
 	/* check for invalid dates */

diff --git a/ext/calendar/julian.c b/ext/calendar/julian.c
@@ -217,7 +217,7 @@ zend_long JulianToSdn(
 						int inputMonth,
 						int inputDay)
 {
-	int year;
+	zend_long year;
 	int month;
 
 	/* check for invalid dates */

diff --git a/ext/calendar/tests/gregoriantojd_overflow.phpt b/ext/calendar/tests/gregoriantojd_overflow.phpt
@@ -0,0 +1,10 @@
+--TEST--
+gregoriantojd()
+--SKIPIF--
+<?php include 'skipif.inc'; ?>
+--FILE--
+<?php
+echo gregoriantojd(5, 5, 6000000) . "\n";
+?>
+--EXPECT--
+2193176185
diff --git a/ext/calendar/tests/juliantojd_overflow.phpt b/ext/calendar/tests/juliantojd_overflow.phpt
@@ -0,0 +1,10 @@
+--TEST--
+juliantojd()
+--SKIPIF--
+<?php include 'skipif.inc'; ?>
+--FILE--
+<?php
+echo juliantojd(5, 5, 6000000000) . "\n";
+?>
+--EXPECT--
+622764916319