mirror of
https://git.freebsd.org/ports.git
synced 2025-05-01 11:06:39 -04:00
f3bf83db98
In https://gitlab.isc.org/isc-projects/kea/-/merge_requests/2410, Francis Dupont noted there were some errors in the unit tests. These were due to mistakes on my side, so I now made sure all the unit tests pass (they silently require GoogleTest!), and updated the upstream merge request. I hope this goes in soon, but it all seems to take a long time. PR: 281124 Approved by: apevnev@me.com (maintainer) MFH: 2024Q3
57 lines
2.6 KiB
C++
57 lines
2.6 KiB
C++
--- src/lib/dns/name.cc.orig 2024-07-25 08:50:58 UTC
|
|
+++ src/lib/dns/name.cc
|
|
@@ -303,7 +303,7 @@ Name::Name(const std::string &namestring, bool downcas
|
|
// And get the output
|
|
labelcount_ = offsets.size();
|
|
isc_throw_assert(labelcount_ > 0 && labelcount_ <= Name::MAX_LABELS);
|
|
- ndata_.assign(ndata.data(), ndata.size());
|
|
+ ndata_.assign(ndata.data(), ndata.data() + ndata.size());
|
|
length_ = ndata_.size();
|
|
offsets_.assign(offsets.begin(), offsets.end());
|
|
}
|
|
@@ -336,7 +336,7 @@ Name::Name(const char* namedata, size_t data_len, cons
|
|
// Get the output
|
|
labelcount_ = offsets.size();
|
|
isc_throw_assert(labelcount_ > 0 && labelcount_ <= Name::MAX_LABELS);
|
|
- ndata_.assign(ndata.data(), ndata.size());
|
|
+ ndata_.assign(ndata.data(), ndata.data() + ndata.size());
|
|
length_ = ndata_.size();
|
|
offsets_.assign(offsets.begin(), offsets.end());
|
|
|
|
@@ -347,7 +347,7 @@ Name::Name(const char* namedata, size_t data_len, cons
|
|
// Drop the last character of the data (the \0) and append a copy of
|
|
// the origin's data
|
|
ndata_.erase(ndata_.end() - 1);
|
|
- ndata_.append(origin->ndata_);
|
|
+ ndata_.insert(ndata_.end(), origin->ndata_.begin(), origin->ndata_.end());
|
|
|
|
// Do a similar thing with offsets. However, we need to move them
|
|
// so they point after the prefix we parsed before.
|
|
@@ -582,7 +582,7 @@ Name::concatenate(const Name& suffix) const {
|
|
|
|
Name retname;
|
|
retname.ndata_.reserve(length);
|
|
- retname.ndata_.assign(ndata_, 0, length_ - 1);
|
|
+ retname.ndata_.assign(ndata_.data(), ndata_.data() + length_ - 1);
|
|
retname.ndata_.insert(retname.ndata_.end(),
|
|
suffix.ndata_.begin(), suffix.ndata_.end());
|
|
isc_throw_assert(retname.ndata_.size() == length);
|
|
@@ -622,7 +622,7 @@ Name::reverse() const {
|
|
NameString::const_iterator n0 = ndata_.begin();
|
|
retname.offsets_.push_back(0);
|
|
while (rit1 != offsets_.rend()) {
|
|
- retname.ndata_.append(n0 + *rit1, n0 + *rit0);
|
|
+ retname.ndata_.insert(retname.ndata_.end(), n0 + *rit1, n0 + *rit0);
|
|
retname.offsets_.push_back(retname.ndata_.size());
|
|
++rit0;
|
|
++rit1;
|
|
@@ -662,7 +662,8 @@ Name::split(const unsigned int first, const unsigned i
|
|
// original name, and append the trailing dot explicitly.
|
|
//
|
|
retname.ndata_.reserve(retname.offsets_.back() + 1);
|
|
- retname.ndata_.assign(ndata_, offsets_[first], retname.offsets_.back());
|
|
+ auto it = ndata_.data() + offsets_[first];
|
|
+ retname.ndata_.assign(it, it + retname.offsets_.back());
|
|
retname.ndata_.push_back(0);
|
|
|
|
retname.length_ = retname.ndata_.size();
|