diff options
-rw-r--r-- | chrome/common/logging_chrome.cc | 4 | ||||
-rw-r--r-- | tools/valgrind/memcheck/suppressions.txt | 7 |
2 files changed, 2 insertions, 9 deletions
diff --git a/chrome/common/logging_chrome.cc b/chrome/common/logging_chrome.cc index 9bbb878..a1963ce 100644 --- a/chrome/common/logging_chrome.cc +++ b/chrome/common/logging_chrome.cc @@ -171,9 +171,9 @@ FilePath SetUpSymlinkIfNeeded(const FilePath& symlink_path, bool new_log) { } } else { char buf[1024]; - size_t count = readlink(target_path.value().c_str(), buf, sizeof(buf)); + size_t count = readlink(target_path.value().c_str(), buf, arraysize(buf)); if (count > 0) { - target_path = FilePath(FilePath::StringType(buf)); + target_path = FilePath(FilePath::StringType(buf, count)); } else { PLOG(ERROR) << "Unable to read symlink " << symlink_path.value(); } diff --git a/tools/valgrind/memcheck/suppressions.txt b/tools/valgrind/memcheck/suppressions.txt index 25238cb..12feeb3 100644 --- a/tools/valgrind/memcheck/suppressions.txt +++ b/tools/valgrind/memcheck/suppressions.txt @@ -3247,10 +3247,3 @@ fun:PKIX_PL_OcspCertID_Create fun:pkix_OcspChecker_CheckLocal } -{ - logging_chrome_to_be_removed - Memcheck:Cond - fun:strlen - ... - fun:*logging16DetermineLogMode* -} |