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

Unified Diff: net/server/web_socket_encoder.cc

Issue 1535363003: Switch to standard integer types in net/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: stddef Created 5 years 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/server/web_socket_encoder.h ('k') | net/server/web_socket_encoder_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/server/web_socket_encoder.cc
diff --git a/net/server/web_socket_encoder.cc b/net/server/web_socket_encoder.cc
index 6e3da4e30ac0965355f983dfd067ddca669619a1..40d8241073d728b26ed5c44403096345a9a7190f 100644
--- a/net/server/web_socket_encoder.cc
+++ b/net/server/web_socket_encoder.cc
@@ -91,7 +91,7 @@ WebSocket::ParseResult DecodeFrameHybi17(const base::StringPiece& frame,
if (client_frame && !masked) // In Hybi-17 spec client MUST mask its frame.
return WebSocket::FRAME_ERROR;
- uint64 payload_length64 = second_byte & kPayloadLengthMask;
+ uint64_t payload_length64 = second_byte & kPayloadLengthMask;
if (payload_length64 > kMaxSingleBytePayloadLength) {
int extended_payload_length_size;
if (payload_length64 == kTwoBytePayloadLengthField)
@@ -110,7 +110,7 @@ WebSocket::ParseResult DecodeFrameHybi17(const base::StringPiece& frame,
}
size_t actual_masking_key_length = masked ? kMaskingKeyWidthInBytes : 0;
- static const uint64 max_payload_length = 0x7FFFFFFFFFFFFFFFull;
+ static const uint64_t max_payload_length = 0x7FFFFFFFFFFFFFFFull;
static size_t max_length = std::numeric_limits<size_t>::max();
if (payload_length64 > max_payload_length ||
payload_length64 + actual_masking_key_length > max_length) {
« no previous file with comments | « net/server/web_socket_encoder.h ('k') | net/server/web_socket_encoder_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698