Merge 255274 "Fixed chrome proxy via check"

net/http/http_response_headers.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // The rules for header parsing were borrowed from Firefox:
 // http://lxr.mozilla.org/seamonkey/source/netwerk/protocol/http/src/nsHttpResponseHead.cpp
 // The rules for parsing content-types were also borrowed from Firefox:
 // http://lxr.mozilla.org/mozilla/source/netwerk/base/src/nsURLHelper.cpp#834
 
 #include "net/http/http_response_headers.h"
@@ skipping 1413 matching lines @@
   const size_t kVersionSize = 4;
   const char kChromeProxyViaValue[] = "Chrome-Compression-Proxy";
   size_t value_len = strlen(kChromeProxyViaValue);
   void* iter = NULL;
   std::string value;
 
   // Case-sensitive comparison of |value|. Assumes the received protocol and the
   // space following it are always |kVersionSize| characters. E.g.,
   // 'Via: 1.1 Chrome-Compression-Proxy'
   while (EnumerateHeader(&iter, "via", &value)) {
-    if (!value.compare(kVersionSize, value_len, kChromeProxyViaValue))
+    if (value.size() >= kVersionSize + value_len &&
+        !value.compare(kVersionSize, value_len, kChromeProxyViaValue))
       return true;
   }
 
   // TODO(bengr): Remove deprecated header value.
   const char kDeprecatedChromeProxyViaValue[] = "1.1 Chrome Compression Proxy";
   iter = NULL;
   while (EnumerateHeader(&iter, "via", &value))
     if (value == kDeprecatedChromeProxyViaValue)
       return true;
 
   return false;
 }
 #endif  // defined(SPDY_PROXY_AUTH_ORIGIN)
 
 }  // namespace net