diff options
| author | shess@chromium.org <shess@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-04 20:53:50 +0000 |
|---|---|---|
| committer | shess@chromium.org <shess@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-04 20:53:50 +0000 |
| commit | e854c90376e2931dfa7467fd544d094ea6c8b756 (patch) | |
| tree | 58f64395edc14fcf9e85c1cf17ba9da91630f455 | |
| parent | 3ad31d51bec846fbf21a107f768c345ada7884f6 (diff) | |
| download | chromium_src-e854c90376e2931dfa7467fd544d094ea6c8b756.zip chromium_src-e854c90376e2931dfa7467fd544d094ea6c8b756.tar.gz chromium_src-e854c90376e2931dfa7467fd544d094ea6c8b756.tar.bz2 | |
[Valgrind] Fix uninitialized read in safe-browsing.
The code uses the idiom of calling GetFileSize(), then only checking
the result if the call failed. AFAICT, this should be safe (the size
is only checked in case of success), but it's confusing.
BUG=96663
TEST=Waterfall doesn't get red.
Review URL: http://codereview.chromium.org/8124017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@103982 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/safe_browsing/safe_browsing_database.cc | 2 | ||||
| -rw-r--r-- | tools/valgrind/memcheck/suppressions_mac.txt | 6 |
2 files changed, 1 insertions, 7 deletions
diff --git a/chrome/browser/safe_browsing/safe_browsing_database.cc b/chrome/browser/safe_browsing/safe_browsing_database.cc index 68d3faf..5210a66 100644 --- a/chrome/browser/safe_browsing/safe_browsing_database.cc +++ b/chrome/browser/safe_browsing/safe_browsing_database.cc @@ -1325,7 +1325,7 @@ void SafeBrowsingDatabaseNew::LoadBloomFilter() { // next update to generate a new filter. // TODO(paulg): Investigate how often the filter file is missing and how // expensive it would be to regenerate it. - int64 size_64; + int64 size_64 = 0; if (!file_util::GetFileSize(browse_filename_, &size_64) || size_64 == 0) return; diff --git a/tools/valgrind/memcheck/suppressions_mac.txt b/tools/valgrind/memcheck/suppressions_mac.txt index fcadd24..45a0fd0 100644 --- a/tools/valgrind/memcheck/suppressions_mac.txt +++ b/tools/valgrind/memcheck/suppressions_mac.txt @@ -1842,12 +1842,6 @@ fun:PyObject_Free } { - bug_96663 - Memcheck:Cond - fun:_ZN23SafeBrowsingDatabaseNew15LoadBloomFilterEv - fun:_ZN23SafeBrowsingDatabaseNew4InitERK8FilePath -} -{ bug_96671 Memcheck:Cond ... |