ext/standard/scanf: convert format param to zend_string

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), ZSTR_VAL(format_str), num_varargs, varargs, return_value);
+	php_sscanf_internal(ZSTR_VAL(intern->u.file.current_line), format_str, num_varargs, varargs, return_value);
 }
 /* }}} */
 

ext/standard/file.c

@@ -929,16 +929,16 @@ PHPAPI PHP_FUNCTION(fgetc)
 PHP_FUNCTION(fscanf)
 {
 	uint32_t argc = 0;
-	size_t format_len;
 	zval *args = NULL;
 	zval *file_handle;
-	char *buf, *format;
+	char *buf;
+	zend_string *format;
 	size_t len;
 	void *what;
 
 	ZEND_PARSE_PARAMETERS_START(2, -1)
 		Z_PARAM_RESOURCE(file_handle)
-		Z_PARAM_STRING(format, format_len)
+		Z_PARAM_STR(format)
 		Z_PARAM_VARIADIC('*', args, argc)
 	ZEND_PARSE_PARAMETERS_END();
 

ext/standard/scanf.c

@@ -299,7 +299,7 @@ static void ReleaseCharSet(CharSet *cset)
  *
  *----------------------------------------------------------------------
 */
-static int ValidateFormat(const char *format, uint32_t numVars, uint32_t *totalSubs)
+static int ValidateFormat(const zend_string *zstr_format, uint32_t numVars, uint32_t *totalSubs)
 {
 #define STATIC_LIST_SIZE 16
 	int flags;
@@ -325,6 +325,7 @@ static int ValidateFormat(const char *format, uint32_t numVars, uint32_t *totalS
 	}
 	memset(nassign, 0, sizeof(uint32_t)*numVars);
 
+	const char *format = ZSTR_VAL(zstr_format);
 	while (*format != '\0') {
 		ch = format++;
 		flags = 0;
@@ -570,7 +571,7 @@ static int ValidateFormat(const char *format, uint32_t numVars, uint32_t *totalS
  *		return_value set with the results of the scan
  */
 
-PHPAPI int php_sscanf_internal(const char *string, const char *format,
+PHPAPI int php_sscanf_internal(const char *string, const zend_string *zstr_format,
 				uint32_t argCount, zval *args,
 				zval *return_value)
 {
@@ -601,7 +602,7 @@ PHPAPI int php_sscanf_internal(const char *string, const char *format,
 	 * Check for errors in the format string.
 	 */
 	uint32_t totalVars = 0;
-	if (ValidateFormat(format, numVars, &totalVars) != SCAN_SUCCESS) {
+	if (ValidateFormat(zstr_format, numVars, &totalVars) != SCAN_SUCCESS) {
 		scan_set_error_return( assignToVariables, return_value );
 		return SCAN_ERROR_INVALID_FORMAT;
 	}
@@ -646,6 +647,7 @@ PHPAPI int php_sscanf_internal(const char *string, const char *format,
 	nconversions = 0;
 	/* note ! - we need to limit the loop for objIndex to keep it in bounds */
 
+	const char *format = ZSTR_VAL(zstr_format);
 	while (*format != '\0') {
 		ch    = format++;
 		flags = 0;

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 char *format,uint32_t argCount,zval *args,
+PHPAPI int php_sscanf_internal(const char *string, const zend_string *format, uint32_t argCount, zval *args,
 				zval *return_value);
 
 

ext/standard/string.c

@@ -5860,13 +5860,14 @@ PHP_FUNCTION(str_pad)
 PHP_FUNCTION(sscanf)
 {
 	zval *args = NULL;
-	char *str, *format;
-	size_t str_len, format_len;
+	char *str;
+	size_t str_len;
+	zend_string *format;
 	uint32_t num_args = 0;
 
 	ZEND_PARSE_PARAMETERS_START(2, -1)
 		Z_PARAM_STRING(str, str_len)
-		Z_PARAM_STRING(format, format_len)
+		Z_PARAM_STR(format)
 		Z_PARAM_VARIADIC('*', args, num_args)
 	ZEND_PARSE_PARAMETERS_END();