diff options
| author | szym@chromium.org <szym@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-04 11:31:03 +0000 |
|---|---|---|
| committer | szym@chromium.org <szym@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-04 11:31:03 +0000 |
| commit | d3b44d7802472e6f450f0c85361b6b302b71529b (patch) | |
| tree | 8442bf8a90792064a4d9ae9028b37c75b66dc952 /net/dns | |
| parent | e8f64789e9cd0a45553c47253051d220f29a6a68 (diff) | |
| download | chromium_src-d3b44d7802472e6f450f0c85361b6b302b71529b.zip chromium_src-d3b44d7802472e6f450f0c85361b6b302b71529b.tar.gz chromium_src-d3b44d7802472e6f450f0c85361b6b302b71529b.tar.bz2 | |
[net/dns] Quick fix for a crash on synchronous DnsUDPAttempt completion.
The result of transactions with synchronous completions might be wrong until
bug 121717 is fixed.
BUG=120976
Review URL: https://chromiumcodereview.appspot.com/9950102
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@130593 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/dns')
| -rw-r--r-- | net/dns/dns_transaction.cc | 8 | ||||
| -rw-r--r-- | net/dns/dns_transaction_unittest.cc | 1 |
2 files changed, 6 insertions, 3 deletions
diff --git a/net/dns/dns_transaction.cc b/net/dns/dns_transaction.cc index ab632f7..6dd939e 100644 --- a/net/dns/dns_transaction.cc +++ b/net/dns/dns_transaction.cc @@ -493,8 +493,10 @@ class DnsTransactionImpl : public DnsTransaction, } break; } + // TODO(szym): The next step might be to make another attempt. + // http://crbug.com/121717 if (rv != ERR_IO_PENDING) - DoCallback(rv, NULL); + DoCallback(rv, attempts_->back()->response()); } void OnTimeout() { @@ -504,8 +506,10 @@ class DnsTransactionImpl : public DnsTransaction, return; } int rv = MakeAttempt(); + // TODO(szym): The next step might be to make another attempt. + // http://crbug.com/121717 if (rv != ERR_IO_PENDING) - DoCallback(rv, NULL); + DoCallback(rv, attempts_->back()->response()); } scoped_refptr<DnsSession> session_; diff --git a/net/dns/dns_transaction_unittest.cc b/net/dns/dns_transaction_unittest.cc index e30fa31..ab9cb69 100644 --- a/net/dns/dns_transaction_unittest.cc +++ b/net/dns/dns_transaction_unittest.cc @@ -153,7 +153,6 @@ class TransactionHelper { } } else { EXPECT_EQ(expected_answer_count_, rv); - EXPECT_EQ(NULL, response); } if (quit_in_callback_) |