GGLinnk/bees
1
0
Fork 0
mirror of https://github.com/Zygo/bees.git synced 2025-05-17 21:35:45 +02:00
Code Packages

bytevector: don't deadlock on operator<<

Browse Source 
operator<< was a friend class that locked the ByteVector, then invoked
hexdump on the bytevector, which used ByteVector::operator[]...which
locked the ByteVector, resulting in a deadlock.

operator<< shouldn't be a friend class anyway.  Make hexdump use the
normal public access methods for ByteVector.

Signed-off-by: Zygo Blaxell <bees@furryterror.org>
This commit is contained in:
Zygo Blaxell 2024-12-03 23:34:09 -05:00
parent 3e89fe34ed
commit e99a505b3b
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/crucible/bytevector.h
View File

@ -55,7 +55,6 @@ namespace crucible {
Pointer m_ptr; Pointer m_ptr;
size_t m_size = 0; size_t m_size = 0;
mutable mutex m_mutex; mutable mutex m_mutex;
friend ostream & operator<<(ostream &os, const ByteVector &bv);
}; };
template <class T> template <class T>
@ -74,6 +73,8 @@ namespace crucible {
THROW_CHECK2(out_of_range, size(), sizeof(T), size() >= sizeof(T)); THROW_CHECK2(out_of_range, size(), sizeof(T), size() >= sizeof(T));
return reinterpret_cast<T*>(data()); return reinterpret_cast<T*>(data());
} }
ostream& operator<<(ostream &os, const ByteVector &bv);
} }
#endif // _CRUCIBLE_BYTEVECTOR_H_ #endif // _CRUCIBLE_BYTEVECTOR_H_

1
lib/bytevector.cc
View File

@ -183,7 +183,6 @@ namespace crucible {
ostream& ostream&
operator<<(ostream &os, const ByteVector &bv) { operator<<(ostream &os, const ByteVector &bv) {
unique_lock<mutex> lock(bv.m_mutex);
hexdump(os, bv); hexdump(os, bv);
return os; return os;
} }