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

glsl/glcpp: fix SIGSEGV when checking error condition for macro redefinition

Browse source 
Commit a6e9cd14c does not take into account than node_{a,b}->next could be NULL
in some circumstances, such as in a shader containing this code:

  #define A 1 /* comment */
  #define A 1 /* comment */

This patch fixes the segmentation fault for cases like that.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=91290
Signed-off-by: Samuel Iglesias Gonsalvez <siglesias@igalia.com>
Reviewed-by: Anuj Phogat <anuj.phogat@gmail.com>
Cc: mesa-stable@lists.freedesktop.org
(cherry picked from commit 30f97b5e52)
This commit is contained in:
Samuel Iglesias Gonsalvez 2015-07-23 10:38:36 +02:00 • committed by Emil Velikov
parent a31dfd91b5
commit 56e4cc67fe
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1074,9 +1074,9 @@ _token_list_equal_ignoring_space (token_list_t *a, token_list_t *b)
*/
if (node_a->token->type == SPACE
&& node_b->token->type == SPACE) {
while (node_a->token->type == SPACE)
while (node_a && node_a->token->type == SPACE)
node_a = node_a->next;
while (node_b->token->type == SPACE)
while (node_b && node_b->token->type == SPACE)
node_b = node_b->next;
continue;
}