hardcoresushi/libcryfs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix clang-tidy warnings

Browse Source
This commit is contained in:
Sebastian Messmer 2017-10-08 18:29:45 +01:00
parent a3e26c7480
commit 8eac0f055f
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/cpp-utils/data/Data.h
View File

@ -68,8 +68,8 @@ bool operator!=(const Data &lhs, const Data &rhs);
// --------------------------- // ---------------------------
inline Data::Data(size_t size) inline Data::Data(size_t size)
: _size(size), _data(std::malloc(size)) { : _size(size), _data((size == 0)?nullptr:std::malloc(size)) {
if (nullptr == _data) { if (_size != 0 && nullptr == _data) {
throw std::bad_alloc(); throw std::bad_alloc();
} }
} }
@ -98,14 +98,18 @@ inline Data::~Data() {
inline Data Data::copy() const { inline Data Data::copy() const {
Data copy(_size); Data copy(_size);
std::memcpy(copy._data, _data, _size); if (_size != 0) {
std::memcpy(copy._data, _data, _size);
}
return copy; return copy;
} }
inline Data Data::copyAndRemovePrefix(size_t prefixSize) const { inline Data Data::copyAndRemovePrefix(size_t prefixSize) const {
ASSERT(prefixSize <= _size, "Can't remove more than there is"); ASSERT(prefixSize <= _size, "Can't remove more than there is");
Data copy(_size - prefixSize); Data copy(_size - prefixSize);
std::memcpy(copy.data(), dataOffset(prefixSize), copy.size()); if (_size != 0) { // If _size == 0, then _data == nullptr, so better don't call memcpy.
std::memcpy(copy.data(), dataOffset(prefixSize), copy.size());
}
return copy; return copy;
} }
@ -130,7 +134,9 @@ inline size_t Data::size() const {
} }
inline Data &Data::FillWithZeroes() & { inline Data &Data::FillWithZeroes() & {
std::memset(_data, 0, _size); if (_size != 0) {
std::memset(_data, 0, _size);
}
return *this; return *this;
} }