mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-09-02 06:55:16 +00:00
Code Issues Releases Wiki Activity

[1470] Added checks for zero length data

Browse Source
This commit is contained in:
Stephen Morris
2011-12-12 19:37:13 +00:00
parent 0a5f810dd8
commit f15d883138
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/lib/dns/rdata.cc
View File

@@ -112,7 +112,9 @@ Generic::Generic(isc::util::InputBuffer& buffer, size_t rdata_len) {
} }
vector<uint8_t> data(rdata_len); vector<uint8_t> data(rdata_len);
if (rdata_len > 0) {
buffer.readData(&data[0], rdata_len); buffer.readData(&data[0], rdata_len);
}
impl_ = new GenericImpl(data); impl_ = new GenericImpl(data);
} }
@@ -242,8 +244,10 @@ compare_internal(const GenericImpl& lhs, const GenericImpl& rhs) {
size_t len = (this_len < other_len) ? this_len : other_len; size_t len = (this_len < other_len) ? this_len : other_len;
int cmp; int cmp;
if ((cmp = memcmp(&lhs.data_[0], &rhs.data_[0], len)) // TODO: is there a need to check len - should we just assert?
!= 0) { // (Depends if it is possible for rdata to have zero length)
if ((len != 0) &&
((cmp = memcmp(&lhs.data_[0], &rhs.data_[0], len)) != 0)) {
return (cmp); return (cmp);
} else { } else {
return ((this_len == other_len) ? 0 : return ((this_len == other_len) ? 0 :