mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

fix: Lifetime of auth_info_ in login handler (#15044)

Browse source
This commit is contained in:
trop[bot] 2018-10-10 12:59:27 +11:00 • committed by Samuel Attard
parent 524bb99948
commit 3d8af9d279
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
atom/browser/login_handler.cc
View file

@ -22,7 +22,7 @@ LoginHandler::LoginHandler(
net::AuthCredentials* credentials, net::AuthCredentials* credentials,
const content::ResourceRequestInfo* resource_request_info) const content::ResourceRequestInfo* resource_request_info)
: credentials_(credentials), : credentials_(credentials),
auth_info_(auth_info), auth_info_(&auth_info),
auth_callback_(std::move(callback)), auth_callback_(std::move(callback)),
weak_factory_(this) { weak_factory_(this) {
DCHECK_CURRENTLY_ON(BrowserThread::IO); DCHECK_CURRENTLY_ON(BrowserThread::IO);

4
atom/browser/login_handler.h
View file

@ -40,7 +40,7 @@ class LoginHandler : public base::RefCountedThreadSafe<LoginHandler> {
// thread. // thread.
content::WebContents* GetWebContents() const; content::WebContents* GetWebContents() const;
const net::AuthChallengeInfo* auth_info() const { return &auth_info_; } const net::AuthChallengeInfo* auth_info() const { return auth_info_.get(); }
private: private:
friend class base::RefCountedThreadSafe<LoginHandler>; friend class base::RefCountedThreadSafe<LoginHandler>;
@ -56,7 +56,7 @@ class LoginHandler : public base::RefCountedThreadSafe<LoginHandler> {
net::AuthCredentials* credentials_; net::AuthCredentials* credentials_;
// Who/where/what asked for the authentication. // Who/where/what asked for the authentication.
const net::AuthChallengeInfo& auth_info_; scoped_refptr<const net::AuthChallengeInfo> auth_info_;
// WebContents associated with the login request. // WebContents associated with the login request.
content::ResourceRequestInfo::WebContentsGetter web_contents_getter_; content::ResourceRequestInfo::WebContentsGetter web_contents_getter_;