From: Ilia Alshanetsky <iliaa@php.net>
Date: Fri, 20 Aug 2004 00:46:49 +0000 (+0000)
Subject: MFH: Fixed bug #29753 (mcal_fetch_event() allows 2nd argument to be optional).
X-Git-Tag: php-4.3.9RC2~20
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1b480cd24b9a9852839e68bee3a64387eeda261a;p=php

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

diff --git a/NEWS b/NEWS
index 2bbe062387..5f310a9cc6 100644
--- 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 5154c6b0c3..9830acd3a1 100644
--- 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);