fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-25 00:00:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

glcpp: Flag invalid pastes for integer followed by non-digits

Browse source 
As recently tested in the additions to the invalid paste test, it is illegal
to paste a non-digit sequence onto the end of an integer.

The 082-invalid-paste test should now pass again.

Reviewed-by: Matt Turner <mattst88@gmail.com>
This commit is contained in:
Carl Worth 2012-11-28 13:01:24 -08:00
parent c86eb0cd65
commit e1597f0a81
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/glsl/glcpp/glcpp-parse.y
View file

@ -1057,16 +1057,23 @@ _token_paste (glcpp_parser_t *parser, token_t *token, token_t *other)
/* Two string-valued tokens can usually just be mashed
* together.
*
* XXX: This isn't actually legitimate. Several things here
* should result in a diagnostic since the result cannot be a
* valid, single pre-processing token. For example, pasting
* "123" and "abc" is not legal, but we don't catch that
* here. */
* There are some exceptions here. Notably, if the first token
* is a string representing an integer, then the second token
* must also be a an integer and must begin with a digit.
*/
if ((token->type == IDENTIFIER || token->type == OTHER || token->type == INTEGER_STRING) &&
(other->type == IDENTIFIER || other->type == OTHER || other->type == INTEGER_STRING))
{
char *str;
if (token->type == INTEGER_STRING) {
if (other->type != INTEGER_STRING)
goto FAIL;
if (other->value.str[0] < '0' ||
other->value.str[0] > '9')
goto FAIL;
}
str = ralloc_asprintf (token, "%s%s", token->value.str,
other->value.str);
combined = _token_create_str (token, token->type, str);
@ -1074,6 +1081,7 @@ _token_paste (glcpp_parser_t *parser, token_t *token, token_t *other)
return combined;
}
FAIL:
glcpp_error (&token->location, parser, "");
ralloc_asprintf_rewrite_tail (&parser->info_log, &parser->info_log_length, "Pasting \"");
_token_print (&parser->info_log, &parser->info_log_length, token);