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

Unified Diff: net/base/ip_address_number.cc

Issue 1692353002: Make IP Address related functions return the empty string when used on an invalid address. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: comments eroman Created 4 years, 10 months 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
Index: net/base/ip_address_number.cc
diff --git a/net/base/ip_address_number.cc b/net/base/ip_address_number.cc
index 1e44b7d3b1ebcc74873fa762eb0ced94411c188d..07fb792d8b31b43cc972fb565a027761ba9d7f3d 100644
--- a/net/base/ip_address_number.cc
+++ b/net/base/ip_address_number.cc
@@ -103,7 +103,7 @@ std::string IPAddressToString(const uint8_t* address, size_t address_len) {
} else if (address_len == kIPv6AddressSize) {
url::AppendIPv6Address(address, &output);
} else {
- CHECK(false) << "Invalid IP address with length: " << address_len;
+ return std::string();
}
output.Complete();
@@ -114,6 +114,8 @@ std::string IPAddressToStringWithPort(const uint8_t* address,
size_t address_len,
uint16_t port) {
std::string address_str = IPAddressToString(address, address_len);
+ if (address_str.empty())
+ return address_str;
if (address_len == kIPv6AddressSize) {
// Need to bracket IPv6 addresses since they contain colons.

Powered by Google App Engine
This is Rietveld 408576698