diff options
| author | groby@chromium.org <groby@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-08 02:14:02 +0000 |
|---|---|---|
| committer | groby@chromium.org <groby@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-08 02:14:02 +0000 |
| commit | e4e7288fbbda34ea9219b0fdb157c5a67762710b (patch) | |
| tree | 8e7f8a04b6f8609a4800fb9ff74b0e7783328a92 | |
| parent | 191f8da8ac04aee79d03c2d8e610d97369fbef0a (diff) | |
| download | chromium_src-e4e7288fbbda34ea9219b0fdb157c5a67762710b.zip chromium_src-e4e7288fbbda34ea9219b0fdb157c5a67762710b.tar.gz chromium_src-e4e7288fbbda34ea9219b0fdb157c5a67762710b.tar.bz2 | |
Fix usage error for libresolv - res_ninit on OSX requires res_ndestroy to close
BUG=95497
TEST=none
Review URL: http://codereview.chromium.org/7839018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@100078 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | net/dns/dns_config_service_posix.cc | 4 | ||||
| -rw-r--r-- | tools/valgrind/memcheck/suppressions_mac.txt | 11 |
2 files changed, 4 insertions, 11 deletions
diff --git a/net/dns/dns_config_service_posix.cc b/net/dns/dns_config_service_posix.cc index c8b4ab1..b05b164 100644 --- a/net/dns/dns_config_service_posix.cc +++ b/net/dns/dns_config_service_posix.cc @@ -35,7 +35,11 @@ class DnsConfigServicePosix::DnsConfigReader : public WatchingFileReader { // Note: res_ninit in glibc always returns 0 and sets RES_INIT. success_ = false; } +#if defined(OS_MACOSX) + res_ndestroy(&res); +#else res_nclose(&res); +#endif } void OnReadFinished() OVERRIDE { diff --git a/tools/valgrind/memcheck/suppressions_mac.txt b/tools/valgrind/memcheck/suppressions_mac.txt index f2f75fc..2e8a870 100644 --- a/tools/valgrind/memcheck/suppressions_mac.txt +++ b/tools/valgrind/memcheck/suppressions_mac.txt @@ -1906,17 +1906,6 @@ fun:_ZN7testing4Test11DeleteSelf_Ev } { - bug_95497 - Memcheck:Leak - fun:calloc - fun:res_build_start - fun:res_9_vinit - fun:res_9_ninit - fun:_ZN3net21DnsConfigServicePosix15DnsConfigReader6DoReadEv - fun:_ZN3net18WatchingFileReader9DoReadJobEv - fun:_ZN4base8internal8Invoker1ILb0ENS0_15InvokerStorage1IMN3net18WatchingFileReaderEFvvEPS4_EES6_E8DoInvokeEPNS0_18InvokerStorageBaseE -} -{ bug_95718 Memcheck:Leak fun:calloc |