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

bitvect: work around incorrect warning from gcc

Browse source 
* spot/misc/bitvect.hh: Don't free the old ptr if realloc() returns
NULL, as this confuse GCC who warns that we are freeing something that
has already been freed.   Instead, let the ~bitvect() destructor
handle this.
This commit is contained in:
Alexandre Duret-Lutz 2023-05-12 11:32:46 +02:00
parent 134da9209c
commit abe7222973
1 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

28
spot/misc/bitvect.hh
View file

@ -1,5 +1,5 @@
// -*- coding: utf-8 -*- // -*- coding: utf-8 -*-
// Copyright (C) 2013-2021 Laboratoire de Recherche et Développement // Copyright (C) 2013-2021, 2023 Laboratoire de Recherche et Développement
// de l'Epita (LRDE). // de l'Epita (LRDE).
// //
// This file is part of Spot, a model checking library. // This file is part of Spot, a model checking library.
@ -111,22 +111,22 @@ namespace spot
return; return;
if (storage_ == &local_storage_) if (storage_ == &local_storage_)
{ {
block_t* new_storage_ = static_cast<block_t*> block_t* new_storage = static_cast<block_t*>
(malloc(new_block_count * sizeof(block_t))); (malloc(new_block_count * sizeof(block_t)));
if (SPOT_UNLIKELY(!new_storage))
throw std::bad_alloc();
for (size_t i = 0; i < block_count_; ++i) for (size_t i = 0; i < block_count_; ++i)
new_storage_[i] = storage_[i]; new_storage[i] = storage_[i];
storage_ = new_storage_; storage_ = new_storage;
} }
else else
{ {
auto old = storage_; block_t* new_storage = static_cast<block_t*>
storage_ = static_cast<block_t*> (realloc(storage_, new_block_count * sizeof(block_t)));
(realloc(old, new_block_count * sizeof(block_t))); if (SPOT_UNLIKELY(!new_storage))
if (!storage_) // storage_, untouched, will be freed by the destructor.
{ throw std::bad_alloc();
free(old); storage_ = new_storage;
throw std::bad_alloc();
}
} }
block_count_ = new_block_count; block_count_ = new_block_count;
} }
@ -134,8 +134,8 @@ namespace spot
private: private:
void grow() void grow()
{ {
size_t new_block_count_ = (block_count_ + 1) * 7 / 5; size_t new_block_count = (block_count_ + 1) * 7 / 5;
reserve_blocks(new_block_count_); reserve_blocks(new_block_count);
} }
public: public: