Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(992)

Unified Diff: components/cronet/android/cronet_url_request_adapter.cc

Issue 1924593002: Do a null check in CronetURLRequestAdapter::GetStatusOnNetworkThread (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address comments Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | components/cronet/android/test/javatests/src/org/chromium/net/GetStatusTest.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/cronet/android/cronet_url_request_adapter.cc
diff --git a/components/cronet/android/cronet_url_request_adapter.cc b/components/cronet/android/cronet_url_request_adapter.cc
index 74440504229091866d01ce8c818e0e4fdc502a39..172757fe2a2caca7b2716ec09763ecd90a5e2231 100644
--- a/components/cronet/android/cronet_url_request_adapter.cc
+++ b/components/cronet/android/cronet_url_request_adapter.cc
@@ -16,6 +16,7 @@
#include "components/cronet/android/url_request_error.h"
#include "jni/CronetUrlRequest_jni.h"
#include "net/base/load_flags.h"
+#include "net/base/load_states.h"
#include "net/base/net_errors.h"
#include "net/base/request_priority.h"
#include "net/cert/cert_status_flags.h"
@@ -299,9 +300,15 @@ void CronetURLRequestAdapter::GetStatusOnNetworkThread(
const {
DCHECK(context_->IsOnNetworkThread());
JNIEnv* env = base::android::AttachCurrentThread();
+ int status = net::LOAD_STATE_IDLE;
+ // |url_request_| is initialized in StartOnNetworkThread, and it is
+ // never nulled. If it is null, it must be that StartOnNetworkThread
+ // has not been called, pretend that we are in LOAD_STATE_IDLE.
+ // See crbug.com/606872.
+ if (url_request_)
+ status = url_request_->GetLoadState().state;
cronet::Java_CronetUrlRequest_onStatus(env, owner_.obj(),
- status_listener_ref.obj(),
- url_request_->GetLoadState().state);
+ status_listener_ref.obj(), status);
}
base::android::ScopedJavaLocalRef<jobjectArray>
« no previous file with comments | « no previous file | components/cronet/android/test/javatests/src/org/chromium/net/GetStatusTest.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698