alarsyo/spot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

merge_states: fix segfault reported by Philipp

Browse source 
* spot/twa/twagraph.cc: Here.
* tests/python/mergedge.py: Add test case.
This commit is contained in:
Alexandre Duret-Lutz 2021-05-31 15:59:31 +02:00
parent 634dd28379
commit edfcd5b0d8
2 changed files with 112 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

30
spot/twa/twagraph.cc
View file

@ -331,7 +331,35 @@ namespace spot
|| (a.dst == a.src && b.dst == b.src))
&& a.data() == b.data()); }))
{
remap[i] = j;
remap[i] = (remap[j] != -1U) ? remap[j] : j;
// Because of the special self-loop tests we use above,
// it's possible that i can be mapped to remap[j] even
// if j was last compatible states found. Consider the
// following cases, taken from an actual test case:
// 18 is equal to 5, 35 is equal to 18, but 35 is not
// equal to 5.
//
// State: 5
// [0&1&2] 8 {3}
// [!0&1&2] 10 {1}
// [!0&!1&!2] 18 {1}
// [!0&!1&2] 19 {1}
// [!0&1&!2] 20 {1}
//
// State: 18
// [0&1&2] 8 {3}
// [!0&1&2] 10 {1}
// [!0&!1&!2] 18 {1} // self-loop
// [!0&!1&2] 19 {1}
// [!0&1&!2] 20 {1}
//
// State: 35
// [0&1&2] 8 {3}
// [!0&1&2] 10 {1}
// [!0&!1&!2] 35 {1} // self-loop
// [!0&!1&2] 19 {1}
// [!0&1&!2] 20 {1}
break;
}
}