From bcdd3638e4bea73432be8f86745ad16d1092f46e Mon Sep 17 00:00:00 2001 From: ArthurSonzogni Date: Mon, 8 May 2023 18:45:42 +0200 Subject: [PATCH] Version v1.1.156 --- CHANGELOG | 2 ++ CMakeLists.txt | 4 ++-- src/translator/graph_planar/GraphPlanar.cpp | 6 ++++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 164c994..88f5675 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,7 @@ # Current +# 1.1.156 (2023-05-08) + ## Security: - See CVE-2023-27390. Check there are no "self" message. - See CVE-2023-31194. Do not add twice an edge in the graph. This caused Boost diff --git a/CMakeLists.txt b/CMakeLists.txt index 74eb999..efe6486 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,9 +1,9 @@ cmake_minimum_required (VERSION 3.15) -set(git_version 148) +set(git_version 156) # Obtained with `git rev-list --count HEAD` project(Diagon LANGUAGES C CXX - VERSION 1.0.${git_version} + VERSION 1.1.${git_version} ) option(DIAGON_BUILD_TESTS "Set to ON to build tests" OFF) diff --git a/src/translator/graph_planar/GraphPlanar.cpp b/src/translator/graph_planar/GraphPlanar.cpp index cee8a3d..fd0a501 100644 --- a/src/translator/graph_planar/GraphPlanar.cpp +++ b/src/translator/graph_planar/GraphPlanar.cpp @@ -355,8 +355,8 @@ void GraphPlanar::Write() { // Create the planar embedding auto embedding_storage = EdgePermutationStorage(num_vertices); auto embedding = EdgePermutation(embedding_storage.begin(), vertex_index); - const bool is_planar = PlanarEmbedding(graph, embedding_storage, embedding); - if (!is_planar) { + const bool is_planar_1 = PlanarEmbedding(graph, embedding_storage, embedding); + if (!is_planar_1) { output_ = "Graph is not planar.\n"; return; } @@ -367,6 +367,7 @@ void GraphPlanar::Write() { graph, embedding, boost::get(boost::edge_index, graph), edge_updater); const bool is_planar_2 = PlanarEmbedding(graph, embedding_storage, embedding); assert(is_planar_2); + std::ignore = is_planar_2; // After executing `make_maximal_planar` edges are added to the graph, so // we must update the indexes and the embedding. @@ -375,6 +376,7 @@ void GraphPlanar::Write() { edge_updater); const bool is_planar_3 = PlanarEmbedding(graph, embedding_storage, embedding); assert(is_planar_3); + std::ignore = is_planar_3; // Find a canonical ordering. std::vector ordering;