ext/standard/scanf: add format_arg_num param

In preparation for better format parsing

Author: Girgias

ext/spl/spl_directory.c

@@ -2494,7 +2494,7 @@ PHP_METHOD(SplFileObject, fscanf)
 		RETURN_THROWS();
 	}
 
-	php_sscanf_internal(ZSTR_VAL(intern->u.file.current_line), format_str, num_varargs, varargs, return_value);
+	php_sscanf_internal(ZSTR_VAL(intern->u.file.current_line), format_str, 1, num_varargs, varargs, return_value);
 }
 /* }}} */
 

ext/standard/file.c

@@ -956,7 +956,7 @@ PHP_FUNCTION(fscanf)
 		RETURN_FALSE;
 	}
 
-	php_sscanf_internal(buf, format, argc, args, return_value);
+	php_sscanf_internal(buf, format, 2, argc, args, return_value);
 
 	efree(buf);
 }

ext/standard/scanf.c

@@ -299,7 +299,7 @@ static void ReleaseCharSet(CharSet *cset)
  *
  *----------------------------------------------------------------------
 */
-static int ValidateFormat(const zend_string *zstr_format, uint32_t numVars, uint32_t *totalSubs)
+static int ValidateFormat(const zend_string *zstr_format, uint32_t format_arg_num, uint32_t numVars, uint32_t *totalSubs)
 {
 #define STATIC_LIST_SIZE 16
 	int flags;
@@ -571,7 +571,7 @@ static int ValidateFormat(const zend_string *zstr_format, uint32_t numVars, uint
  *		return_value set with the results of the scan
  */
 
-PHPAPI int php_sscanf_internal(const char *string, const zend_string *zstr_format,
+PHPAPI int php_sscanf_internal(const char *string, const zend_string *zstr_format, uint32_t format_arg_num,
 				uint32_t argCount, zval *args,
 				zval *return_value)
 {
@@ -602,7 +602,7 @@ PHPAPI int php_sscanf_internal(const char *string, const zend_string *zstr_forma
 	 * Check for errors in the format string.
 	 */
 	uint32_t totalVars = 0;
-	if (ValidateFormat(zstr_format, numVars, &totalVars) != SCAN_SUCCESS) {
+	if (ValidateFormat(zstr_format, format_arg_num, numVars, &totalVars) != SCAN_SUCCESS) {
 		scan_set_error_return( assignToVariables, return_value );
 		return SCAN_ERROR_INVALID_FORMAT;
 	}

ext/standard/scanf.h

@@ -33,7 +33,7 @@
  * The following are here solely for the benefit of the scanf type functions
  * e.g. fscanf
  */
-PHPAPI int php_sscanf_internal(const char *string, const zend_string *format, uint32_t argCount, zval *args,
+PHPAPI int php_sscanf_internal(const char *string, const zend_string *format, uint32_t format_arg_num, uint32_t argCount, zval *args,
 				zval *return_value);
 
 

ext/standard/string.c

@@ -5871,7 +5871,7 @@ PHP_FUNCTION(sscanf)
 		Z_PARAM_VARIADIC('*', args, num_args)
 	ZEND_PARSE_PARAMETERS_END();
 
-	php_sscanf_internal(str, format, num_args, args, return_value);
+	php_sscanf_internal(str, format, 2, num_args, args, return_value);
 
 }
 /* }}} */