Merge pull request #11268 from electron/fix_crash

Don't access unique pointer after it was moved from
This commit is contained in:
Charles Kerr 2017-11-27 19:20:44 +01:00 committed by GitHub
commit e24cd329d9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -800,16 +800,21 @@ void InspectableWebContentsImpl::OnURLFetchComplete(
DCHECK(it != pending_requests_.end());
base::DictionaryValue response;
auto headers = base::MakeUnique<base::DictionaryValue>();
net::HttpResponseHeaders* rh = source->GetResponseHeaders();
response.SetInteger("statusCode", rh ? rh->response_code() : 200);
response.Set("headers", std::move(headers));
size_t iterator = 0;
std::string name;
std::string value;
while (rh && rh->EnumerateHeaderLines(&iterator, &name, &value))
headers->SetString(name, value);
{
auto headers = base::MakeUnique<base::DictionaryValue>();
size_t iterator = 0;
std::string name;
std::string value;
while (rh && rh->EnumerateHeaderLines(&iterator, &name, &value))
headers->SetString(name, value);
response.Set("headers", std::move(headers));
}
it->second.Run(&response);
pending_requests_.erase(it);