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

Unified Diff: net/spdy/header_coalescer.cc

Issue 2028473003: Move header-ordering validation from hpack decoder to header validator. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix lint errors. Created 4 years, 6 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 | « net/spdy/header_coalescer.h ('k') | net/spdy/hpack/hpack_decoder.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/spdy/header_coalescer.cc
diff --git a/net/spdy/header_coalescer.cc b/net/spdy/header_coalescer.cc
index c3af46f5cb92087ce5563a1a8c7d34f35fb7c8a2..d4faa4fc056b7052fbf9a35d340a87e2583d4c53 100644
--- a/net/spdy/header_coalescer.cc
+++ b/net/spdy/header_coalescer.cc
@@ -11,8 +11,9 @@ namespace net {
const size_t kMaxHeaderListSize = 256 * 1024;
void HeaderCoalescer::OnHeader(base::StringPiece key, base::StringPiece value) {
- if (error_seen_)
+ if (error_seen_) {
return;
+ }
if (key.empty()) {
DVLOG(1) << "Header name must not be empty.";
@@ -27,6 +28,15 @@ void HeaderCoalescer::OnHeader(base::StringPiece key, base::StringPiece value) {
return;
}
+ if (key[0] == ':') {
+ if (protocol_version_ == HTTP2 && regular_header_seen_) {
+ error_seen_ = true;
+ return;
+ }
+ } else {
+ regular_header_seen_ = true;
+ }
+
auto iter = headers_.find(key);
if (iter == headers_.end()) {
headers_[key] = value;
« no previous file with comments | « net/spdy/header_coalescer.h ('k') | net/spdy/hpack/hpack_decoder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698