diff options
| author | Jason Monk <jmonk@google.com> | 2013-08-26 13:08:48 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-08-26 13:08:49 +0000 |
| commit | 155ecd15c2abe3f480ce2eeb2cffc61498c04054 (patch) | |
| tree | 93c19c2935533576dbf618e81e589ecc5345cf32 /src | |
| parent | 0c66f82bb6180da8fd218d66e3613a2a19345ff2 (diff) | |
| parent | c064be0a4ce83c22411d16ff6c1e129f2b9341d0 (diff) | |
| download | chromium-libpac-155ecd15c2abe3f480ce2eeb2cffc61498c04054.tar.gz | |
Merge "Fix crash in ParseIpLiteralToNumber" into klp-dev
Diffstat (limited to 'src')
| -rw-r--r-- | src/net_util.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/net_util.cc b/src/net_util.cc index 32a8193..5f8c88b 100644 --- a/src/net_util.cc +++ b/src/net_util.cc @@ -32,7 +32,10 @@ bool ParseIPLiteralToNumber(const std::string& ip_literal, mode = AF_INET6; size = sizeof(struct in6_addr); } - inet_pton(mode, ip_literal.c_str(), buf); + if (inet_pton(mode, ip_literal.c_str(), buf) != 1) { + return false; + } + ip_number->resize(size); for (int i = 0; i < size; i++) { (*ip_number)[i] = buf[i]; } |