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

Unified Diff: content/browser/devtools/devtools_agent_host_impl.cc

Issue 2198503002: DevTools: do not CHECK devtools messages received from renderer in the browser, issue bad_message i… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebaselined 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
Index: content/browser/devtools/devtools_agent_host_impl.cc
diff --git a/content/browser/devtools/devtools_agent_host_impl.cc b/content/browser/devtools/devtools_agent_host_impl.cc
index 1c7f9a641a74442f6a45f90ea00acce50375067a..109dccd0976b10575a2da8af4ef673ccac31e8f5 100644
--- a/content/browser/devtools/devtools_agent_host_impl.cc
+++ b/content/browser/devtools/devtools_agent_host_impl.cc
@@ -287,7 +287,7 @@ DevToolsMessageChunkProcessor::DevToolsMessageChunkProcessor(
DevToolsMessageChunkProcessor::~DevToolsMessageChunkProcessor() {
}
-void DevToolsMessageChunkProcessor::ProcessChunkedMessageFromAgent(
+bool DevToolsMessageChunkProcessor::ProcessChunkedMessageFromAgent(
const DevToolsMessageChunk& chunk) {
if (chunk.is_last && !chunk.post_state.empty())
state_cookie_ = chunk.post_state;
@@ -295,9 +295,10 @@ void DevToolsMessageChunkProcessor::ProcessChunkedMessageFromAgent(
last_call_id_ = chunk.call_id;
if (chunk.is_first && chunk.is_last) {
- CHECK(message_buffer_size_ == 0);
+ if (message_buffer_size_ != 0)
+ return false;
callback_.Run(chunk.session_id, chunk.data);
- return;
+ return true;
}
if (chunk.is_first) {
@@ -306,16 +307,18 @@ void DevToolsMessageChunkProcessor::ProcessChunkedMessageFromAgent(
message_buffer_size_ = chunk.message_size;
}
- CHECK(message_buffer_.size() + chunk.data.size() <=
- message_buffer_size_);
+ if (message_buffer_.size() + chunk.data.size() > message_buffer_size_)
+ return false;
message_buffer_.append(chunk.data);
if (chunk.is_last) {
- CHECK(message_buffer_.size() == message_buffer_size_);
+ if (message_buffer_.size() != message_buffer_size_)
+ return false;
callback_.Run(chunk.session_id, message_buffer_);
message_buffer_ = std::string();
message_buffer_size_ = 0;
}
+ return true;
}
} // namespace content
« no previous file with comments | « content/browser/devtools/devtools_agent_host_impl.h ('k') | content/browser/devtools/render_frame_devtools_agent_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698