| 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;
|
|
|