MFH: Fixed bug #29753 (mcal_fetch_event() allows 2nd argument to be optional).

diff --git a/NEWS b/NEWS
index 2bbe062387864dd8cc4b1f815df14a2e32e418bd..5f310a9cc6ae6efa39d1fbf612164f2e9d098fc6 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,8 @@ PHP 4                                                                      NEWS
 ?? ??? 2004, Version 4.3.9
 - Fixed bug with raw_post_data not getting set (Brian)
 - Fixed a file-descriptor leak with phpinfo() and other 'special' URLs (Zeev)
+- Fixed bug #29753 (mcal_fetch_event() allows 2nd argument to be optional).
+  (Ilia, Vrana)
 - Fixed bug #29727 (Added missing CURL authentication directives). (Ilia)
 - Fixed bug #29719 (fgetcsv() has problem parsing strings ending with escaped
   enclosures). (Ilia)

diff --git a/ext/mcal/php_mcal.c b/ext/mcal/php_mcal.c
index 5154c6b0c3bafaf3f2107ac75721d4c206ef4d78..9830acd3a1b5886b8471869aabb8e0188716a663 100644 (file)
--- a/ext/mcal/php_mcal.c
+++ b/ext/mcal/php_mcal.c
@@ -459,7 +459,7 @@ PHP_FUNCTION(mcal_fetch_event)
        CALEVENT *myevent;
        int myargcount=ZEND_NUM_ARGS();
        
-       if (myargcount < 1 || myargcount > 3 || zend_get_parameters_ex(myargcount, &streamind, &eventid, &options) == FAILURE) {
+       if (myargcount < 2 || myargcount > 3 || zend_get_parameters_ex(myargcount, &streamind, &eventid, &options) == FAILURE) {
                WRONG_PARAM_COUNT;
        }
        convert_to_long_ex(streamind);