Do not call callback->Run() until we are about to return from this

net/http/disk_cache_based_ssl_host_info.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/http/disk_cache_based_ssl_host_info.h"
 
 #include "base/callback.h"
 #include "base/logging.h"
 #include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
@@ skipping 23 matching lines @@
 }
 
 DiskCacheBasedSSLHostInfo::DiskCacheBasedSSLHostInfo(
     const std::string& hostname,
     const SSLConfig& ssl_config,
     CertVerifier* cert_verifier,
     HttpCache* http_cache)
     : SSLHostInfo(hostname, ssl_config, cert_verifier),
       weak_ptr_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)),
       callback_(new CallbackImpl(weak_ptr_factory_.GetWeakPtr(),
-                                 &DiskCacheBasedSSLHostInfo::DoLoop)),
+                                 &DiskCacheBasedSSLHostInfo::OnIOComplete)),
       state_(GET_BACKEND),
       ready_(false),
       hostname_(hostname),
       http_cache_(http_cache),
       backend_(NULL),
       entry_(NULL),
       user_callback_(NULL) {
 }
 
 void DiskCacheBasedSSLHostInfo::Start() {
@@ skipping 36 matching lines @@
   if (entry_)
     entry_->Close();
   if (!IsCallbackPending())
     delete callback_;
 }
 
 std::string DiskCacheBasedSSLHostInfo::key() const {
   return "sslhostinfo:" + hostname_;
 }
 
-void DiskCacheBasedSSLHostInfo::DoLoop(int rv) {
+void DiskCacheBasedSSLHostInfo::OnIOComplete(int rv) {
+  rv = DoLoop(rv);
+  if (rv != ERR_IO_PENDING) {
+    CompletionCallback* callback = user_callback_;
+    user_callback_ = NULL;
+    if (callback)
+      callback->Run(rv);
+  }
+}
+
+int DiskCacheBasedSSLHostInfo::DoLoop(int rv) {
   do {
     switch (state_) {
       case GET_BACKEND:
         rv = DoGetBackend();
         break;
       case GET_BACKEND_COMPLETE:
         rv = DoGetBackendComplete(rv);
         break;
       case OPEN:
         rv = DoOpen();
@@ skipping 23 matching lines @@
         rv = DoWriteComplete(rv);
         break;
       case SET_DONE:
         rv = DoSetDone();
         break;
       default:
         rv = OK;
         NOTREACHED();
     }
   } while (rv != ERR_IO_PENDING && state_ != NONE);
+
+  return rv;
 }
 
 int DiskCacheBasedSSLHostInfo::DoGetBackendComplete(int rv) {
   if (rv == OK) {
     backend_ = callback_->backend();
     state_ = OPEN;
   } else {
     state_ = WAIT_FOR_DATA_READY_DONE;
   }
   return OK;
 }
 
 int DiskCacheBasedSSLHostInfo::DoOpenComplete(int rv) {
   if (rv == OK) {
     entry_ = callback_->entry();
     state_ = READ;
   } else {
     state_ = WAIT_FOR_DATA_READY_DONE;
   }
 
   return OK;
 }
 
 int DiskCacheBasedSSLHostInfo::DoReadComplete(int rv) {
   if (rv > 0)
-    data_ = std::string(read_buffer_->data(), rv);
+    data_.assign(read_buffer_->data(), rv);
 
   state_ = WAIT_FOR_DATA_READY_DONE;
   return OK;
 }
 
 int DiskCacheBasedSSLHostInfo::DoWriteComplete(int rv) {
   state_ = SET_DONE;
   return OK;
 }
 
@@ skipping 39 matching lines @@
                            new_data_.size(), callback_, true /* truncate */);
 }
 
 int DiskCacheBasedSSLHostInfo::DoCreate() {
   DCHECK(entry_ == NULL);
   state_ = CREATE_COMPLETE;
   return backend_->CreateEntry(key(), callback_->entry_pointer(), callback_);
 }
 
 int DiskCacheBasedSSLHostInfo::DoWaitForDataReadyDone() {
-  CompletionCallback* callback;
-
   DCHECK(!ready_);
   state_ = NONE;
   ready_ = true;
-  callback = user_callback_;
-  user_callback_ = NULL;
   // We close the entry because, if we shutdown before ::Persist is called,
   // then we might leak a cache reference, which causes a DCHECK on shutdown.
   if (entry_)
     entry_->Close();
   entry_ = NULL;
   Parse(data_);
-
-  if (callback)
-    callback->Run(OK);
-
   return OK;
 }
 
 int DiskCacheBasedSSLHostInfo::DoSetDone() {
   if (entry_)
     entry_->Close();
   entry_ = NULL;
   state_ = NONE;
   return OK;
 }
 
 bool DiskCacheBasedSSLHostInfo::IsCallbackPending() const {
   switch (state_) {
     case GET_BACKEND_COMPLETE:
     case OPEN_COMPLETE:
     case READ_COMPLETE:
     case CREATE_COMPLETE:
     case WRITE_COMPLETE:
       return true;
     default:
       return false;
   }
 }
 
 }  // namespace net