From: Paul Selkirk <pselkirk@isc.org>
Date: Wed, 8 May 2013 14:59:40 +0000 (-0400)
Subject: [2522] initialize impl_ directly in TSIG lexer constructor
X-Git-Tag: bind10-1.2.0beta1-release~430^2~24
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=da4f84b70faf79d279dd1ad978ee007b9fbd6447;p=thirdparty%2Fkea.git

[2522] initialize impl_ directly in TSIG lexer constructor
---

diff --git a/src/lib/dns/rdata/any_255/tsig_250.cc b/src/lib/dns/rdata/any_255/tsig_250.cc
index e71e548a22..955ddd4548 100644
--- a/src/lib/dns/rdata/any_255/tsig_250.cc
+++ b/src/lib/dns/rdata/any_255/tsig_250.cc
@@ -138,7 +138,7 @@ TSIG::constructFromLexer(MasterLexer& lexer) {
     if (otherlen > 0xffff) {
         isc_throw(InvalidRdataText, "TSIG Other Len out of range");
     }
-    const string otherdata_txt = (otherlen > 0) ? 
+    const string otherdata_txt = (otherlen > 0) ?
             lexer.getNextToken(MasterToken::STRING).getString() : "";
     vector<uint8_t> other_data;
     decodeBase64(otherdata_txt, other_data);
@@ -239,9 +239,8 @@ TSIG::TSIG(const std::string& tsig_str) : impl_(NULL) {
 /// RDATA to be created
 TSIG::TSIG(MasterLexer& lexer, const Name*,
                MasterLoader::Options, MasterLoaderCallbacks&) :
-    impl_(NULL)
+    impl_(constructFromLexer(lexer))
 {
-    impl_ = constructFromLexer(lexer);
 }
 
 /// \brief Constructor from wire-format data.