From: Alex Rousskov <rousskov@measurement-factory.com>
Date: Tue, 16 Mar 2021 15:45:11 +0000 (-0400)
Subject: Merge pull request from GHSA-jjq6-mh2h-g39h
X-Git-Tag: 4.15-20210522-snapshot~22
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=051824924c709bd6162a378f746fb859454c674e;p=thirdparty%2Fsquid.git

Merge pull request from GHSA-jjq6-mh2h-g39h
---

diff --git a/src/http/RegisteredHeaders.cc b/src/http/RegisteredHeaders.cc
index a4f96db2b7..84f177af2d 100644
--- a/src/http/RegisteredHeaders.cc
+++ b/src/http/RegisteredHeaders.cc
@@ -37,7 +37,7 @@ HeaderTableRecord::HeaderTableRecord(const char *n, HdrType theId, HdrFieldType
 const HeaderTableRecord&
 HeaderLookupTable_t::lookup (const char *buf, const std::size_t len) const {
     const HeaderTableRecord *r = HttpHeaderHashTable::lookup(buf, len);
-    if (!r)
+    if (!r || r->id == Http::HdrType::OTHER)
         return BadHdr;
     return *r;
 }