adjusted from reviews

Author: juan-morales

ext/json/json.c

@@ -400,15 +400,10 @@ PHP_FUNCTION(json_last_error_msg)
 {
 	ZEND_PARSE_PARAMETERS_NONE();
 
-	if (JSON_G(error_line) > 0 && JSON_G(error_column) > 0) {
-		zend_string *error_msg = php_json_get_error_msg_with_location(
-			JSON_G(error_code),
-			JSON_G(error_line),
-			JSON_G(error_column)
-		);
-		RETVAL_STR(error_msg);
-	} else {
-		RETURN_STRING(php_json_get_error_msg(JSON_G(error_code)));
-	}
+	RETVAL_STR(php_json_get_error_msg_with_location(
+		JSON_G(error_code),
+		JSON_G(error_line),
+		JSON_G(error_column)
+	));
 }
 /* }}} */

ext/json/json_parser.y

@@ -306,11 +306,6 @@ static void php_json_yyerror(YYLTYPE *location, php_json_parser *parser, char co
 	if (!parser->scanner.errcode) {
 		parser->scanner.errcode = PHP_JSON_ERROR_SYNTAX;
 	}
-
-	parser->scanner.errloc.first_column = location->first_column;
-	parser->scanner.errloc.first_line = location->first_line;
-	parser->scanner.errloc.last_column = location->last_column;
-	parser->scanner.errloc.last_line = location->last_line;
 }
 
 PHP_JSON_API php_json_error_code php_json_parser_error_code(const php_json_parser *parser)

ext/json/json_scanner.re

@@ -52,7 +52,7 @@
 
 #define PHP_JSON_INT_MAX_LENGTH (MAX_LENGTH_OF_LONG - 1)
 
-#define PHP_JSON_TOKEN_LENGTH(s) ((size_t) ((s)->cursor - (s)->token))
+#define PHP_JSON_TOKEN_LENGTH() ((size_t) (s->cursor - s->token))
 #define PHP_JSON_TOKEN_LOCATION(location) (s)->errloc.location
 
 static void php_json_scanner_copy_string(php_json_scanner *s, size_t esc_size)
@@ -198,7 +198,7 @@ std:
 	}
 	<JS>INT                  {
 		bool bigint = 0, negative = s->token[0] == '-';
-		size_t digits = PHP_JSON_TOKEN_LENGTH(s);
+		size_t digits = PHP_JSON_TOKEN_LENGTH();
 		PHP_JSON_TOKEN_LOCATION(last_column) += digits;
 		digits -= negative;
 		if (digits >= PHP_JSON_INT_MAX_LENGTH) {
@@ -223,7 +223,7 @@ std:
 		}
 	}
 	<JS>FLOAT|EXP            {
-		PHP_JSON_TOKEN_LOCATION(last_column) += PHP_JSON_TOKEN_LENGTH(s);
+		PHP_JSON_TOKEN_LOCATION(last_column) += PHP_JSON_TOKEN_LENGTH();
 		ZVAL_DOUBLE(&s->value, zend_strtod((char *) s->token, NULL));
 		return PHP_JSON_T_DOUBLE;
 	}
@@ -233,7 +233,7 @@ std:
 		goto std;
 	}
 	<JS>WS                   {
-		PHP_JSON_TOKEN_LOCATION(last_column) += PHP_JSON_TOKEN_LENGTH(s);
+		PHP_JSON_TOKEN_LOCATION(last_column) += PHP_JSON_TOKEN_LENGTH();
 		goto std;
 	}
 	<JS>EOI                  {