BIND 10 trac598_new, updated. 744fe91ac965c576cbe916ca39a0bef54afdcd3f [trac598_new] Fix the segmentation fault error in the unittest of ForwardQuery.

BIND 10 source code commits bind10-changes at lists.isc.org
Thu May 12 02:24:20 UTC 2011


The branch, trac598_new has been updated
       via  744fe91ac965c576cbe916ca39a0bef54afdcd3f (commit)
      from  32872f1e745f45d1c0e84943cf57ad985a925f3e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 744fe91ac965c576cbe916ca39a0bef54afdcd3f
Author: zhanglikun <zhanglikun at cnnic.cn>
Date:   Thu May 12 10:24:10 2011 +0800

    [trac598_new] Fix the segmentation fault error in the unittest of ForwardQuery.

-----------------------------------------------------------------------

Summary of changes:
 src/lib/resolve/recursive_query.cc                |    3 ++-
 src/lib/resolve/tests/recursive_query_unittest.cc |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/resolve/recursive_query.cc b/src/lib/resolve/recursive_query.cc
index 0f22fdd..3adc45e 100644
--- a/src/lib/resolve/recursive_query.cc
+++ b/src/lib/resolve/recursive_query.cc
@@ -824,7 +824,8 @@ public:
         query_timeout_(query_timeout),
         client_timer(io.get_io_service()),
         lookup_timer(io.get_io_service()),
-        outstanding_events_(0)
+        outstanding_events_(0),
+        callback_called_(false)
     {
         // Setup the timer to stop trying (lookup_timeout)
         if (lookup_timeout >= 0) {
diff --git a/src/lib/resolve/tests/recursive_query_unittest.cc b/src/lib/resolve/tests/recursive_query_unittest.cc
index 9f92e00..4e939fa 100644
--- a/src/lib/resolve/tests/recursive_query_unittest.cc
+++ b/src/lib/resolve/tests/recursive_query_unittest.cc
@@ -748,7 +748,7 @@ TEST_F(RecursiveQueryTest, forwardClientTimeout) {
     query.forward(ConstMessagePtr(&query_message), answer, buffer, &server, callback);
     // Run the test
     io_service_->run();
-    EXPECT_EQ(callback->result, MockResolverCallback::SUCCESS);
+    EXPECT_EQ(callback->result, MockResolverCallback::FAILURE);
 }
 
 // If we set lookup timeout to lower than querytimeout, the lookup




More information about the bind10-changes mailing list