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

[#53,!125] Mysql buffer always initialized for HW address in v6.

Browse Source
This commit is contained in:
Marcin Siodelski
2018-11-16 20:27:21 +01:00
parent ef12c64791
commit 038eddbc7b
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/lib/dhcpsrv/mysql_lease_mgr.cc
View File

@@ -496,7 +496,7 @@ public:
client_id_length_ = client_id_.size(); client_id_length_ = client_id_.size();
// Make sure that the buffer has at least length of 1, even if // Make sure that the buffer has at least length of 1, even if
// empty HW address is passed. This is required by some of the // empty client id is passed. This is required by some of the
// MySQL connectors that the buffer is set to non-null value. // MySQL connectors that the buffer is set to non-null value.
// Otherwise, null value would be inserted into the database, // Otherwise, null value would be inserted into the database,
// rather than empty string. // rather than empty string.
@@ -1933,7 +1933,7 @@ MySqlLeaseMgr::getLease4(const HWAddr& hwaddr) const {
// If the data happens to be empty, we have to create a 1 byte dummy // If the data happens to be empty, we have to create a 1 byte dummy
// buffer and pass it to the binding. // buffer and pass it to the binding.
std::vector<uint8_t> single_byte_vec(1); uint8_t single_byte_data = 0;
// As "buffer" is "char*" - even though the data is being read - we need // As "buffer" is "char*" - even though the data is being read - we need
// to cast away the "const"ness as well as reinterpreting the data as // to cast away the "const"ness as well as reinterpreting the data as
@@ -1941,7 +1941,7 @@ MySqlLeaseMgr::getLease4(const HWAddr& hwaddr) const {
// local variable, but as the data is only being read, this introduces // local variable, but as the data is only being read, this introduces
// an unnecessary copy). // an unnecessary copy).
uint8_t* data = !hwaddr.hwaddr_.empty() ? const_cast<uint8_t*>(&hwaddr.hwaddr_[0]) uint8_t* data = !hwaddr.hwaddr_.empty() ? const_cast<uint8_t*>(&hwaddr.hwaddr_[0])
: &single_byte_vec[0]; : &single_byte_data;
inbind[0].buffer = reinterpret_cast<char*>(data); inbind[0].buffer = reinterpret_cast<char*>(data);
inbind[0].buffer_length = hwaddr_length; inbind[0].buffer_length = hwaddr_length;
@@ -2197,9 +2197,18 @@ MySqlLeaseMgr::getLeases6(Lease::Type lease_type,
// data). For that reason, "const_cast" has been used. // data). For that reason, "const_cast" has been used.
const vector<uint8_t>& duid_vector = duid.getDuid(); const vector<uint8_t>& duid_vector = duid.getDuid();
unsigned long duid_length = duid_vector.size(); unsigned long duid_length = duid_vector.size();
// Make sure that the buffer has at least length of 1, even if
// empty client id is passed. This is required by some of the
// MySQL connectors that the buffer is set to non-null value.
// Otherwise, null value would be inserted into the database,
// rather than empty string.
uint8_t single_byte_data = 0;
uint8_t* data = !duid_vector.empty() ? const_cast<uint8_t*>(&duid_vector[0])
: &single_byte_data;
inbind[0].buffer_type = MYSQL_TYPE_BLOB; inbind[0].buffer_type = MYSQL_TYPE_BLOB;
inbind[0].buffer = reinterpret_cast<char*>( inbind[0].buffer = reinterpret_cast<char*>(data);
const_cast<uint8_t*>(&duid_vector[0]));
inbind[0].buffer_length = duid_length; inbind[0].buffer_length = duid_length;
inbind[0].length = &duid_length; inbind[0].length = &duid_length;