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

relabel: fix infinite recursion in relabel_bse()

Browse source 
Reported by František Blahoudek.

* spot/tl/relabel.cc: Fix.
* tests/core/ltlrel.test: Add test case.
* NEWS: Mention the bug.
This commit is contained in:
Alexandre Duret-Lutz 2016-06-14 09:56:17 +02:00
parent 272daf62fc
commit a0cd56735a
3 changed files with 16 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
NEWS
View file

@ -79,6 +79,7 @@ New in spot 2.0.1a (not yet released)
* Fix compilation error observed with Clang++ 3.7.1 and GCC 6.1.1
headers.
* Fix an infinite recursion in relabel_bse().
New in spot 2.0.1 (2016-05-09)

3
spot/tl/relabel.cc
View file

@ -433,13 +433,14 @@ namespace spot
/// it as ((a & b) & Xc) in the graph to isolate the
/// Boolean operands as a single node.
formula b = f.boolean_operands(&i);
if (b)
if (b && b != f)
{
res.reserve(sz - i + 1);
res.push_back(visit(b));
}
else
{
i = 0;
res.reserve(sz);
}
for (; i < sz; ++i)

14
tests/core/ltlrel.test
View file

@ -1,6 +1,6 @@
#! /bin/sh
# -*- coding: utf-8 -*-
# Copyright (C) 2013 Laboratoire de Recherche et Dévelopement to
# Copyright (C) 2013, 2016 Laboratoire de Recherche et Dévelopement to
# l'Epita (LRDE).
#
# This file is part of Spot, a model checking library.
@ -77,3 +77,15 @@ t <<EOF
p1 -> b
p2 -> c
EOF
# This one used to stack overflow due to an infinite recursion
# in the relabeling function. Reported by František Blahoudek.
t <<EOF
<>p1 -> ((p0 -> (!p1 U (!p1 && p3 && !p5 && X((!p1 && !p5) U p4)))) U p1)
Fp0 -> ((p1 -> (!p0 U (!p0 & p2 & p3 & X((!p0 & p3) U p4)))) U p0)
p0 -> p1
p1 -> p0
p2 -> p3
p3 -> !p5
p4 -> p4
EOF