[3824] #3824 patches

diff --git a/src/lib/dns/master_loader.cc b/src/lib/dns/master_loader.cc
index 80b1053432301783dc4418b4f5a23bdba99c4f98..f508bf3de4e0bf88dbd6263834385eee8f7df2e6 100644 (file)
--- a/src/lib/dns/master_loader.cc
+++ b/src/lib/dns/master_loader.cc
@@ -12,6 +12,8 @@
 // OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 // PERFORMANCE OF THIS SOFTWARE.
 
+#include <config.h>
+
 #include <dns/master_loader.h>
 #include <dns/master_lexer.h>
 #include <dns/name.h>
@@ -657,9 +659,8 @@ MasterLoader::MasterLoaderImpl::generateForIter(const std::string& str,
               continue;
           }
 
-          // 'it' can be equal to str.end() here, but it is handled
-          // correctly.
-          if (*it != '{') {
+          // The str.end() check is required.
+          if ((it == str.end()) || (*it != '{')) {
               // There is no modifier (between {}), so just copy the
               // passed number into the generated string.
               rstr += boost::str(boost::format("%d") % num);

diff --git a/src/lib/dns/rdata/generic/detail/char_string.cc b/src/lib/dns/rdata/generic/detail/char_string.cc
index 328fa7b406401b5dcb2419c403c455e5d072a66b..702ba3072a68b15f6f656af630ac567bffec107f 100644 (file)
--- a/src/lib/dns/rdata/generic/detail/char_string.cc
+++ b/src/lib/dns/rdata/generic/detail/char_string.cc
@@ -186,6 +186,15 @@ int compareCharStrings(const detail::CharString& self,
     const size_t self_len = self[0];
     const size_t other_len = other[0];
     const size_t cmp_len = std::min(self_len, other_len);
+    if (cmp_len == 0) {
+        if (self_len < other_len) {
+            return (-1);
+        } else if (self_len > other_len) {
+            return (1);
+        } else {
+            return (0);
+        }
+    }
     const int cmp = std::memcmp(&self[1], &other[1], cmp_len);
     if (cmp < 0) {
         return (-1);

diff --git a/src/lib/dns/rdata/generic/dnskey_48.cc b/src/lib/dns/rdata/generic/dnskey_48.cc
index 3ef6c72f90217d10f8b968f4db5205db549e42dd..8b930147175ccde056b75aa8e41aa975965ad22a 100644 (file)
--- a/src/lib/dns/rdata/generic/dnskey_48.cc
+++ b/src/lib/dns/rdata/generic/dnskey_48.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2010  Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2010, 2015  Internet Systems Consortium, Inc. ("ISC")
 //
 // Permission to use, copy, modify, and/or distribute this software for any
 // purpose with or without fee is hereby granted, provided that the above
@@ -268,6 +268,9 @@ DNSKEY::compare(const Rdata& other) const {
     const size_t this_len = impl_->keydata_.size();
     const size_t other_len = other_dnskey.impl_->keydata_.size();
     const size_t cmplen = min(this_len, other_len);
+    if (cmplen == 0) {
+        return ((this_len == other_len) ? 0 : (this_len < other_len) ? -1 : 1);
+    }
     const int cmp = memcmp(&impl_->keydata_[0],
                            &other_dnskey.impl_->keydata_[0], cmplen);
     if (cmp != 0) {

diff --git a/src/lib/dns/rdata/generic/opt_41.cc b/src/lib/dns/rdata/generic/opt_41.cc
index 6b292e9fa1dff6bfabb9cff7fad5f4e800ee9368..7ed28df100fd1fbecde8e8e332ea97f5018c7f41 100644 (file)
--- a/src/lib/dns/rdata/generic/opt_41.cc
+++ b/src/lib/dns/rdata/generic/opt_41.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2010-2013  Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2010-2013, 2015  Internet Systems Consortium, Inc. ("ISC")
 //
 // Permission to use, copy, modify, and/or distribute this software for any
 // purpose with or without fee is hereby granted, provided that the above
@@ -211,7 +211,9 @@ OPT::appendPseudoRR(uint16_t code, const uint8_t* data, uint16_t length) {
 
     boost::shared_ptr<std::vector<uint8_t> >
         option_data(new std::vector<uint8_t>(length));
-    std::memcpy(&(*option_data)[0], data, length);
+    if (length != 0) {
+        std::memcpy(&(*option_data)[0], data, length);
+    }
     impl_->pseudo_rrs_.push_back(PseudoRR(code, option_data));
     impl_->rdlength_ += length;
 }

diff --git a/src/lib/dns/rdataclass.cc b/src/lib/dns/rdataclass.cc
index 9e0390f781fc92517d8de85f589e8b2cfa769bae..5a2ceb157438725fb5402147d3d6a1fde78aab83 100644 (file)
--- a/src/lib/dns/rdataclass.cc
+++ b/src/lib/dns/rdataclass.cc
@@ -1855,6 +1855,9 @@ DNSKEY::compare(const Rdata& other) const {
     const size_t this_len = impl_->keydata_.size();
     const size_t other_len = other_dnskey.impl_->keydata_.size();
     const size_t cmplen = min(this_len, other_len);
+    if (cmplen == 0) {
+      return ((this_len == other_len) ? 0 : (this_len < other_len) ? -1 : 1);
+    }
     const int cmp = memcmp(&impl_->keydata_[0],
                            &other_dnskey.impl_->keydata_[0], cmplen);
     if (cmp != 0) {
@@ -3961,7 +3964,9 @@ OPT::appendPseudoRR(uint16_t code, const uint8_t* data, uint16_t length) {
 
     boost::shared_ptr<std::vector<uint8_t> >
         option_data(new std::vector<uint8_t>(length));
-    std::memcpy(&(*option_data)[0], data, length);
+    if (length != 0) {
+        std::memcpy(&(*option_data)[0], data, length);
+    }
     impl_->pseudo_rrs_.push_back(PseudoRR(code, option_data));
     impl_->rdlength_ += length;
 }