mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -04:00
37 lines
1.5 KiB
Diff
37 lines
1.5 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Kenichi Ishibashi <bashi@chromium.org>
|
|
Date: Tue, 18 Apr 2023 05:58:29 +0000
|
|
Subject: Check callback availability in
|
|
SpdyProxyClientSocket::RunWriteCallback
|
|
|
|
OnClose() could consume `write_callback_` so it may not be available
|
|
when RunWriteCallback() is invoked.
|
|
|
|
Bug: 1428820
|
|
Change-Id: I9a5ade62d67f5bf15e12d0915d1ad6098657ffd4
|
|
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4437791
|
|
Code-Coverage: Findit <findit-for-me@appspot.gserviceaccount.com>
|
|
Reviewed-by: Adam Rice <ricea@chromium.org>
|
|
Commit-Queue: Kenichi Ishibashi <bashi@chromium.org>
|
|
Cr-Commit-Position: refs/heads/main@{#1131689}
|
|
|
|
diff --git a/net/spdy/spdy_proxy_client_socket.cc b/net/spdy/spdy_proxy_client_socket.cc
|
|
index 73ca8d0c2958e532ac9810f5de40405d6e91cdeb..e1b9ba74afc49a5ddef1f45ada996bad3db05d12 100644
|
|
--- a/net/spdy/spdy_proxy_client_socket.cc
|
|
+++ b/net/spdy/spdy_proxy_client_socket.cc
|
|
@@ -277,10 +277,11 @@ int SpdyProxyClientSocket::GetLocalAddress(IPEndPoint* address) const {
|
|
}
|
|
|
|
void SpdyProxyClientSocket::RunWriteCallback(int result) {
|
|
- CHECK(write_callback_);
|
|
-
|
|
base::WeakPtr<SpdyProxyClientSocket> weak_ptr = weak_factory_.GetWeakPtr();
|
|
- std::move(write_callback_).Run(result);
|
|
+ // `write_callback_` might be consumed by OnClose().
|
|
+ if (write_callback_) {
|
|
+ std::move(write_callback_).Run(result);
|
|
+ }
|
|
if (!weak_ptr) {
|
|
// `this` was already destroyed while running `write_callback_`. Must
|
|
// return immediately without touching any field member.
|