Fix integer overflow in calender.

Fix int overflows in conversation functions for calendar.
Add tests for the overflows.

diff --git a/ext/calendar/calendar.c b/ext/calendar/calendar.c
index 40ae249cdabf77a8eb21be7357efd5ea84bbd6c0..47f2c1dd54306917811165713cc97bf0f784fb94 100644 (file)
--- 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          |
    | license@php.net so we can mail you a copy immediately.               |
    +----------------------------------------------------------------------+
-   | Authors: Shane Caraveo             <shane@caraveo.com>               | 
+   | Authors: Shane Caraveo             <shane@caraveo.com>               |
    |          Colin Viebrock            <colin@easydns.com>               |
    |          Hartmut Holzgraefe        <hholzgra@php.net>                |
    |          Wez Furlong               <wez@thebrainroom.com>            |

diff --git a/ext/calendar/gregor.c b/ext/calendar/gregor.c
index 069fe6eb5ae7160dfae0fd62d9bdf28987953cd7..4c91fa8d540084a6d262ff76798574b5066b037c 100644 (file)
--- 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
index 904727ff0424a2e35ba23e6bc2b9f70455aad779..6ab0854c3be7730832d56ff89a6d4c76971ea5ae 100644 (file)
--- 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
new file mode 100644 (file)
index 0000000..a189cc8
--- /dev/null
+++ 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
new file mode 100644 (file)
index 0000000..f2f5aa1
--- /dev/null
+++ 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