changes from feedback

Author: devnexen

ext/intl/dateformat/dateformat_parse.c

@@ -45,14 +45,14 @@ static void internal_parse_to_timestamp(IntlDateFormatter_object *dfo, char* tex
 	if (UNEXPECTED(update_calendar)) {
 		UCalendar      *parsed_calendar = (UCalendar *)udat_getCalendar(DATE_FORMAT_OBJECT(dfo));
 		udat_parseCalendar( DATE_FORMAT_OBJECT(dfo), parsed_calendar, text_utf16, text_utf16_len, parse_pos, &INTL_DATA_ERROR_CODE(dfo));
-		if( text_utf16 ){
+		if(text_utf16) {
 			efree(text_utf16);
 		}
 		INTL_METHOD_CHECK_STATUS( dfo, "Calendar parsing failed" );
 		timestamp = ucal_getMillis( parsed_calendar, &INTL_DATA_ERROR_CODE(dfo));
 	} else {
 		timestamp = udat_parse( DATE_FORMAT_OBJECT(dfo), text_utf16, text_utf16_len, parse_pos, &INTL_DATA_ERROR_CODE(dfo));
-		if( text_utf16 ){
+		if(text_utf16) {
 			efree(text_utf16);
 		}
 	}
@@ -154,12 +154,12 @@ PHP_FUNCTION(datefmt_parse)
 			RETURN_FALSE;
 		}
 		parse_pos = (int32_t)long_parse_pos;
-		if((size_t)parse_pos > text_len) {
+		if ((size_t)parse_pos > text_len) {
 			RETURN_FALSE;
 		}
 	}
-	internal_parse_to_timestamp( dfo, text_to_parse, text_len, z_parse_pos?&parse_pos:NULL, false, return_value);
-	if(z_parse_pos) {
+	internal_parse_to_timestamp( dfo, text_to_parse, text_len, z_parse_pos ? &parse_pos : NULL, false, return_value);
+	if (z_parse_pos) {
 		zval_ptr_dtor(z_parse_pos);
 		ZVAL_LONG(z_parse_pos, parse_pos);
 	}
@@ -168,38 +168,40 @@ PHP_FUNCTION(datefmt_parse)
 
 PHP_METHOD(IntlDateFormatter, parseToCalendar)
 {
-	char*           text_to_parse = NULL;
-	size_t          text_len =0;
+	zend_string    *text_to_parse = NULL;
 	zval*         	z_parse_pos = NULL;
 	int32_t		parse_pos = -1;
 
 	DATE_FORMAT_METHOD_INIT_VARS;
 
-	/* Parse parameters. */
-	if( zend_parse_method_parameters( ZEND_NUM_ARGS(), getThis(), "Os|z!",
-		&object, IntlDateFormatter_ce_ptr, &text_to_parse, &text_len, &z_parse_pos ) == FAILURE ){
-		RETURN_THROWS();
-	}
+	ZEND_PARSE_PARAMETERS_START(1, 2)
+		Z_PARAM_STR(text_to_parse)
+		Z_PARAM_OPTIONAL
+		Z_PARAM_ZVAL(z_parse_pos)
+	ZEND_PARSE_PARAMETERS_END();
+
+	object = ZEND_THIS;
 
 	/* Fetch the object. */
 	DATE_FORMAT_METHOD_FETCH_OBJECT;
 
 	if (z_parse_pos) {
 		zend_long long_parse_pos;
 		ZVAL_DEREF(z_parse_pos);
-		long_parse_pos = zval_get_long(z_parse_pos);
-		if (ZEND_LONG_INT_OVFL(long_parse_pos)) {
+		bool failed = false;
+		long_parse_pos = zval_try_get_long(z_parse_pos, &failed);
+		if (failed || ZEND_LONG_INT_OVFL(long_parse_pos)) {
 			intl_error_set_code(NULL, U_ILLEGAL_ARGUMENT_ERROR);
-			intl_error_set_custom_msg(NULL, "String index is out of valid range.", 0);
+			intl_error_set_custom_msg(NULL, "String index is invalid or out of valid range.", 0);
 			RETURN_FALSE;
 		}
 		parse_pos = (int32_t)long_parse_pos;
-		if((size_t)parse_pos > text_len) {
+		if(parse_pos != -1 && (size_t)parse_pos > ZSTR_LEN(text_to_parse)) {
 			RETURN_FALSE;
 		}
 	}
-	internal_parse_to_timestamp( dfo, text_to_parse, text_len, z_parse_pos?&parse_pos:NULL, true, return_value);
-	if(z_parse_pos) {
+	internal_parse_to_timestamp( dfo, ZSTR_VAL(text_to_parse), ZSTR_LEN(text_to_parse), z_parse_pos ? &parse_pos : NULL, true, return_value);
+	if (z_parse_pos) {
 		zval_ptr_dtor(z_parse_pos);
 		ZVAL_LONG(z_parse_pos, parse_pos);
 	}