Skip to content

Commit

Permalink
Version v1.1.156
Browse files Browse the repository at this point in the history
  • Loading branch information
ArthurSonzogni committed May 8, 2023
1 parent 3a4a549 commit 43ba0b0
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 4 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
6 changes: 4 additions & 2 deletions src/translator/graph_planar/GraphPlanar.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand All @@ -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.
Expand All @@ -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<size_t> ordering;
Expand Down

0 comments on commit 43ba0b0

Please sign in to comment.