Browse Source

don't check EOF after >> stringbuf. apparently g++ 3.x doesn't set it
in this case.


git-svn-id: svn://bind10.isc.org/svn/bind10/trunk@1068 e5f2f494-b856-4b98-b285-d166d9295462

JINMEI Tatuya 15 years ago
parent
commit
52263167cd

+ 1 - 1
src/lib/dns/cpp/rdata/generic/dnskey_48.cc

@@ -58,7 +58,7 @@ DNSKEY::DNSKEY(const string& dnskey_str) :
     stringbuf keydatabuf;
 
     iss >> flags >> protocol >> algorithm >> &keydatabuf;
-    if (iss.bad() || iss.fail() || !iss.eof()) {
+    if (iss.bad() || iss.fail()) {
         dns_throw(InvalidRdataText, "Invalid DNSKEY text");
     }
     if (flags > 0xffff) {

+ 1 - 1
src/lib/dns/cpp/rdata/generic/ds_43.cc

@@ -57,7 +57,7 @@ DS::DS(const string& ds_str) :
     stringbuf digestbuf;
 
     iss >> tag >> algorithm >> digest_type >> &digestbuf;
-    if (iss.bad() || iss.fail() || !iss.eof()) {
+    if (iss.bad() || iss.fail()) {
         dns_throw(InvalidRdataText, "Invalid DS text");
     }
     if (tag > 0xffff) {

+ 1 - 1
src/lib/dns/cpp/rdata/generic/rrsig_46.cc

@@ -75,7 +75,7 @@ RRSIG::RRSIG(const string& rrsig_str) :
     iss >> covered_txt >> algorithm >> labels >> originalttl
         >> expire_txt >> inception_txt >> tag >> signer_txt
         >> &signaturebuf;
-    if (iss.bad() || iss.fail() || !iss.eof()) {
+    if (iss.bad() || iss.fail()) {
         dns_throw(InvalidRdataText, "Invalid RRSIG text");
     }
     if (algorithm > 0xff) {