[2572] adjusted getTotalSourceSize() to handle unknown source size

diff --git a/src/lib/dns/master_lexer.cc b/src/lib/dns/master_lexer.cc
index 710f349c76f7f78777f42ef5c00cf85ea9c228be..518bea3731f98613711d975776ad66e68ed31862 100644 (file)
--- a/src/lib/dns/master_lexer.cc
+++ b/src/lib/dns/master_lexer.cc
@@ -187,6 +187,12 @@ size_t
 MasterLexer::getTotalSourceSize() const {
     size_t total_size = 0;
     BOOST_FOREACH(InputSourcePtr& src, impl_->sources_) {
+        // If the size of any pushed source is unknown, the total is also
+        // considered unknown.
+        if (src->getSize() == SOURCE_SIZE_UNKNOWN) {
+            return (SOURCE_SIZE_UNKNOWN);
+        }
+
         total_size += src->getSize();
     }
     return (total_size);

diff --git a/src/lib/dns/tests/master_lexer_unittest.cc b/src/lib/dns/tests/master_lexer_unittest.cc
index 65ca08a13573bd51b773220e632158643ac09bbb..c8ab61f5f135c21eb8e21d3dc53d8bf63583ae3e 100644 (file)
--- a/src/lib/dns/tests/master_lexer_unittest.cc
+++ b/src/lib/dns/tests/master_lexer_unittest.cc
@@ -142,6 +142,24 @@ TEST_F(MasterLexerTest, nestedPush) {
     EXPECT_TRUE(lexer.getSourceName().empty());
 }
 
+TEST_F(MasterLexerTest, unknownSourceSize) {
+    // Similar to the previous case, but the size of the second source
+    // will be considered "unknown" (by emulating an error).
+    ss << "test";
+    lexer.pushSource(ss);
+    EXPECT_EQ(4, lexer.getTotalSourceSize());
+
+    stringstream ss2;
+    ss2.setstate(std::ios_base::failbit); // this will make the size unknown
+    lexer.pushSource(ss2);
+    // Then the total size is also unknown.
+    EXPECT_EQ(MasterLexer::SOURCE_SIZE_UNKNOWN, lexer.getTotalSourceSize());
+
+    // If we pop that source, the size becomes known again.
+    lexer.popSource();
+    EXPECT_EQ(4, lexer.getTotalSourceSize());
+}
+
 TEST_F(MasterLexerTest, invalidPop) {
     // popSource() cannot be called if the sources stack is empty.
     EXPECT_THROW(lexer.popSource(), isc::InvalidOperation);