From: JINMEI Tatuya <jinmei@isc.org>
Date: Thu, 30 Aug 2012 23:58:34 +0000 (-0700)
Subject: [2098] make sure unexpected method call doesn't happen by exception/assert
X-Git-Tag: trac2351_base~91^2~9
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e8ec4c911eb69b969df42a60fb28d5f727b8a937;p=thirdparty%2Fkea.git

[2098] make sure unexpected method call doesn't happen by exception/assert
---

diff --git a/src/lib/datasrc/memory/rdata_serialization.cc b/src/lib/datasrc/memory/rdata_serialization.cc
index 6c3e06c35b..6ac18d0e6a 100644
--- a/src/lib/datasrc/memory/rdata_serialization.cc
+++ b/src/lib/datasrc/memory/rdata_serialization.cc
@@ -250,6 +250,7 @@ public:
     virtual void setCompressMode(CompressMode) {}
     virtual void writeName(const LabelSequence&, bool) {
         // We don't need this version of writeName
+        isc_throw(Unexpected, "unexpected version of writeName is called");
     }
 
     // Called for each domain name in the RDATA, from the RDATA's toWire()
diff --git a/src/lib/dns/benchmarks/message_renderer_bench.cc b/src/lib/dns/benchmarks/message_renderer_bench.cc
index 752b1f664c..6376498087 100644
--- a/src/lib/dns/benchmarks/message_renderer_bench.cc
+++ b/src/lib/dns/benchmarks/message_renderer_bench.cc
@@ -116,7 +116,11 @@ public:
     virtual void writeName(const Name& name, const bool = false) {
         name.toWire(getBuffer());
     }
-    virtual void writeName(const LabelSequence&, const bool) {} // unused
+    virtual void writeName(const LabelSequence&, const bool) {
+        // We shouldn't use this version of writeName (and we internally
+        // control it, so we simply assert it here)
+        assert(false);
+    }
 };
 
 void
diff --git a/src/lib/dns/benchmarks/oldmessagerenderer.cc b/src/lib/dns/benchmarks/oldmessagerenderer.cc
index a6c7990115..ed575a083f 100644
--- a/src/lib/dns/benchmarks/oldmessagerenderer.cc
+++ b/src/lib/dns/benchmarks/oldmessagerenderer.cc
@@ -277,7 +277,9 @@ OldMessageRenderer::writeName(const Name& name, const bool compress) {
 
 void
 OldMessageRenderer::writeName(const LabelSequence&, const bool) {
-    // we don't use this mode for the benchmark
+    // We shouldn't use this version of writeName (and we internally
+    // control it, so we simply assert it here)
+    assert(false);
 }
 
 }