diff options
| author | Jason Monk <jmonk@google.com> | 2013-08-26 13:08:36 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-08-26 13:08:36 +0000 |
| commit | 0c66f82bb6180da8fd218d66e3613a2a19345ff2 (patch) | |
| tree | d79a37d920548a41de0cc9baf3e21fe1fec9d015 | |
| parent | eafc0fa00299168e43ad7d42c545c18b12aa8f3e (diff) | |
| parent | 86b75a5f88eda8b47d1e34e26dfc0210aec09367 (diff) | |
| download | chromium-libpac-0c66f82bb6180da8fd218d66e3613a2a19345ff2.tar.gz | |
Merge "Fix SortIpAddressList to iterate properly." into klp-dev
| -rw-r--r-- | src/proxy_resolver_v8.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/proxy_resolver_v8.cc b/src/proxy_resolver_v8.cc index 345457c..deb06fe 100644 --- a/src/proxy_resolver_v8.cc +++ b/src/proxy_resolver_v8.cc @@ -300,7 +300,7 @@ bool SortIpAddressList(const std::string& ip_address_list, if (!ParseIPLiteralToNumber(tok_list, &ip_num)) return false; ip_vector.push_back(IPAddress(tok_list, ip_num)); - tok_list = strtok(tok_list, ";"); + tok_list = strtok(NULL, ";"); } if (ip_vector.empty()) // Can happen if we have something like |