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

Unified Diff: net/base/dns_util.cc

Issue 761903003: Update from https://crrev.com/306655 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 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/android/network_change_notifier_delegate_android.cc ('k') | net/base/elements_upload_data_stream.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/base/dns_util.cc
diff --git a/net/base/dns_util.cc b/net/base/dns_util.cc
index c095eb80ad6cd49bb0e61d8c9c9f9eafdfc48e3d..f75cd956663e77123cb90a8614cdba27b667f6f7 100644
--- a/net/base/dns_util.cc
+++ b/net/base/dns_util.cc
@@ -13,9 +13,9 @@ bool DNSDomainFromDot(const base::StringPiece& dotted, std::string* out) {
const char* buf = dotted.data();
unsigned n = dotted.size();
char label[63];
- unsigned int labellen = 0; /* <= sizeof label */
+ size_t labellen = 0; /* <= sizeof label */
char name[255];
- unsigned int namelen = 0; /* <= sizeof name */
+ size_t namelen = 0; /* <= sizeof name */
char ch;
for (;;) {
@@ -27,7 +27,7 @@ bool DNSDomainFromDot(const base::StringPiece& dotted, std::string* out) {
if (labellen) {
if (namelen + labellen + 1 > sizeof name)
return false;
- name[namelen++] = labellen;
+ name[namelen++] = static_cast<char>(labellen);
memcpy(name + namelen, label, labellen);
namelen += labellen;
labellen = 0;
@@ -42,7 +42,7 @@ bool DNSDomainFromDot(const base::StringPiece& dotted, std::string* out) {
if (labellen) {
if (namelen + labellen + 1 > sizeof name)
return false;
- name[namelen++] = labellen;
+ name[namelen++] = static_cast<char>(labellen);
memcpy(name + namelen, label, labellen);
namelen += labellen;
labellen = 0;
« no previous file with comments | « net/android/network_change_notifier_delegate_android.cc ('k') | net/base/elements_upload_data_stream.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698