From: Mukund Sivaraman <muks@isc.org>
Date: Thu, 6 Feb 2014 12:21:17 +0000 (+0530)
Subject: [2512] Update check to an assertion
X-Git-Tag: bind10-1.2.0beta1-release~38^2~11
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=79defea75c875181597598e880ee20af3016167f;p=thirdparty%2Fkea.git

[2512] Update check to an assertion

All the constructors currently check that the tag field is not empty.
---

diff --git a/src/lib/dns/rdata/generic/caa_257.cc b/src/lib/dns/rdata/generic/caa_257.cc
index 47366d651a..ecaf559591 100644
--- a/src/lib/dns/rdata/generic/caa_257.cc
+++ b/src/lib/dns/rdata/generic/caa_257.cc
@@ -242,11 +242,12 @@ CAA::~CAA() {
 void
 CAA::toWire(OutputBuffer& buffer) const {
     buffer.writeUint8(impl_->flags_);
+
+    // The constructors must ensure that the tag field is not empty.
+    assert(!impl_->tag_.empty());
     buffer.writeUint8(impl_->tag_.size());
-    if (!impl_->tag_.empty()) {
-        buffer.writeData(&impl_->tag_[0],
-                         impl_->tag_.size());
-    }
+    buffer.writeData(&impl_->tag_[0], impl_->tag_.size());
+
     if (impl_->value_.size() > 1) {
         buffer.writeData(&impl_->value_[1],
                          impl_->value_.size() - 1);
@@ -256,11 +257,12 @@ CAA::toWire(OutputBuffer& buffer) const {
 void
 CAA::toWire(AbstractMessageRenderer& renderer) const {
     renderer.writeUint8(impl_->flags_);
+
+    // The constructors must ensure that the tag field is not empty.
+    assert(!impl_->tag_.empty());
     renderer.writeUint8(impl_->tag_.size());
-    if (!impl_->tag_.empty()) {
-        renderer.writeData(&impl_->tag_[0],
-                           impl_->tag_.size());
-    }
+    renderer.writeData(&impl_->tag_[0], impl_->tag_.size());
+
     if (impl_->value_.size() > 1) {
         renderer.writeData(&impl_->value_[1],
                            impl_->value_.size() - 1);