diff --git a/NEWS b/NEWS index 543517055..e1a9cdd1d 100644 --- a/NEWS +++ b/NEWS @@ -32,6 +32,8 @@ New in spot 2.1.1.dev (not yet released) * Fix python errors on Darwin when using methods from the spot module inside of the spot.ltsmin submodule. + * Fix ltlcross crash when combining --no-check with --verbose. + New in spot 2.1.1 (2016-09-20) Command-line tools: diff --git a/bin/ltlcross.cc b/bin/ltlcross.cc index 55bfdcda9..3a6f6c962 100644 --- a/bin/ltlcross.cc +++ b/bin/ltlcross.cc @@ -1066,6 +1066,8 @@ namespace auto tmp = [&](std::vector& x, unsigned i, const char prefix) { + if (!x[i]) + return; std::cerr << "info: " << prefix << i << "\t("; printsize(x[i]); std::cerr << ')'; @@ -1094,7 +1096,7 @@ namespace std::vector& to, unsigned i, char prefix) { - if (!to[i]) + if (from[i] && !to[i]) { if (print_first) { diff --git a/tests/core/ltlcross3.test b/tests/core/ltlcross3.test index 5ef75e4ed..b998a928e 100755 --- a/tests/core/ltlcross3.test +++ b/tests/core/ltlcross3.test @@ -1,7 +1,7 @@ #!/bin/sh # -*- coding: utf-8 -*- -# Copyright (C) 2012, 2013, 2014, 2015 Laboratoire de Recherche et -# Développement de l'Epita (LRDE). +# Copyright (C) 2012, 2013, 2014, 2015, 2016 Laboratoire de Recherche +# et Développement de l'Epita (LRDE). # # This file is part of Spot, a model checking library. # @@ -180,3 +180,7 @@ cat >expected<