[svn] commit: r1068 - in /trunk/src/lib/dns/cpp/rdata/generic: dnskey_48.cc ds_43.cc rrsig_46.cc

BIND 10 source code commits bind10-changes at lists.isc.org
Tue Mar 2 03:32:27 UTC 2010


Author: jinmei
Date: Tue Mar  2 03:32:27 2010
New Revision: 1068

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

Modified:
    trunk/src/lib/dns/cpp/rdata/generic/dnskey_48.cc
    trunk/src/lib/dns/cpp/rdata/generic/ds_43.cc
    trunk/src/lib/dns/cpp/rdata/generic/rrsig_46.cc

Modified: trunk/src/lib/dns/cpp/rdata/generic/dnskey_48.cc
==============================================================================
--- trunk/src/lib/dns/cpp/rdata/generic/dnskey_48.cc (original)
+++ trunk/src/lib/dns/cpp/rdata/generic/dnskey_48.cc Tue Mar  2 03:32:27 2010
@@ -58,7 +58,7 @@
     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) {

Modified: trunk/src/lib/dns/cpp/rdata/generic/ds_43.cc
==============================================================================
--- trunk/src/lib/dns/cpp/rdata/generic/ds_43.cc (original)
+++ trunk/src/lib/dns/cpp/rdata/generic/ds_43.cc Tue Mar  2 03:32:27 2010
@@ -57,7 +57,7 @@
     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) {

Modified: trunk/src/lib/dns/cpp/rdata/generic/rrsig_46.cc
==============================================================================
--- trunk/src/lib/dns/cpp/rdata/generic/rrsig_46.cc (original)
+++ trunk/src/lib/dns/cpp/rdata/generic/rrsig_46.cc Tue Mar  2 03:32:27 2010
@@ -75,7 +75,7 @@
     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) {




More information about the bind10-changes mailing list