diff options
| author | apavlov@chromium.org <apavlov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-28 13:49:43 +0000 |
|---|---|---|
| committer | apavlov@chromium.org <apavlov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-28 13:49:43 +0000 |
| commit | 2d1f10f1c53598f182a6a0b631ab312a2de360a8 (patch) | |
| tree | 2ba18e14c4697dd2af94e63c594b32b2704bcc61 /webkit | |
| parent | 4ee322340c4c0749699b9d50548c3505f45e8ead (diff) | |
| download | chromium_src-2d1f10f1c53598f182a6a0b631ab312a2de360a8.zip chromium_src-2d1f10f1c53598f182a6a0b631ab312a2de360a8.tar.gz chromium_src-2d1f10f1c53598f182a6a0b631ab312a2de360a8.tar.bz2 | |
Fix race-conditioned DevTools crash when navigating to a redirecting page
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/515040
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35299 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/glue/webdevtoolsfrontend_impl.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/webkit/glue/webdevtoolsfrontend_impl.cc b/webkit/glue/webdevtoolsfrontend_impl.cc index 987cafb..8949fca 100644 --- a/webkit/glue/webdevtoolsfrontend_impl.cc +++ b/webkit/glue/webdevtoolsfrontend_impl.cc @@ -82,7 +82,11 @@ class ToolsAgentNativeDelegateImpl : public ToolsAgentNativeDelegate { // ToolsAgentNativeDelegate implementation. virtual void DidGetResourceContent(int request_id, const String& content) { if (!resource_content_requests_.contains(request_id)) { - ASSERT_NOT_REACHED(); + // This can happen when the redirect source content is reported + // (after a new Delegate has been created due to JsReset, thus losing the + // |request_id| put into resource_content_requests_ by RequestSent) + // which we should ignore. We cannot identify the case relying solely on + // the |content| (which may or may not be null for various 3xx responses). return; } ResourceContentRequestData request = |