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

Unified Diff: content/browser/web_contents/web_contents_impl.cc

Issue 2172123004: Add check for mismatching item and document sequence numbers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixing the comment. Created 4 years, 5 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 | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/web_contents/web_contents_impl.cc
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 1fb9201c58d29fbde43c47ce8305b46c99893df0..2688776cd2dad1199b350281326e76880f6619ad 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -10,6 +10,7 @@
#include <utility>
#include "base/command_line.h"
+#include "base/debug/dump_without_crashing.h"
#include "base/feature_list.h"
#include "base/lazy_instance.h"
#include "base/location.h"
@@ -81,6 +82,7 @@
#include "content/common/input/web_input_event_traits.h"
#include "content/common/input_messages.h"
#include "content/common/page_messages.h"
+#include "content/common/page_state_serialization.h"
#include "content/common/site_isolation_policy.h"
#include "content/common/ssl_status_serialization.h"
#include "content/common/view_messages.h"
@@ -4475,6 +4477,25 @@ void WebContentsImpl::UpdateStateForFrame(RenderFrameHost* render_frame_host,
if (page_state == frame_entry->page_state())
return; // Nothing to update.
+ // The document_sequence_number and item_sequence_number recorded in the
+ // FrameNavigationEntry should not differ from the one coming with the update,
+ // since it must come from the same document.
+ ExplodedPageState exploded_state;
+ if (!DecodePageState(page_state.ToEncodedData(), &exploded_state))
+ return;
+
+ if (exploded_state.top.document_sequence_number !=
+ frame_entry->document_sequence_number() ||
+ exploded_state.top.item_sequence_number !=
+ frame_entry->item_sequence_number()) {
+ // Generate a minidump, which can be debugged to understand the root cause
+ // this unexpected update.
+ // TODO(nasko): Remove once https://crbug.com/628677 is understood.
+ base::debug::Alias(&page_state);
+ base::debug::DumpWithoutCrashing();
+ return;
+ }
+
frame_entry->set_page_state(page_state);
controller_.NotifyEntryChanged(entry);
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698