summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhans@chromium.org <hans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-03 11:36:56 +0000
committerhans@chromium.org <hans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-03 11:36:56 +0000
commit48531b3466bdd7c9a28cc7822b8368967068135c (patch)
tree2a428e68e8942f5e3da9e46a9912f0814dbc2911
parent65d988363b5e2eac988357c20d90c353e1f194af (diff)
downloadchromium_src-48531b3466bdd7c9a28cc7822b8368967068135c.zip
chromium_src-48531b3466bdd7c9a28cc7822b8368967068135c.tar.gz
chromium_src-48531b3466bdd7c9a28cc7822b8368967068135c.tar.bz2
Roll flac 120064:120197.
This picks up a fix for the memory leak that was introduced in the previous roll. BUG=112416 TEST=memory bots Review URL: http://codereview.chromium.org/9315051 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@120317 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS2
-rw-r--r--tools/heapcheck/suppressions.txt10
-rw-r--r--tools/valgrind/memcheck/suppressions.txt10
3 files changed, 1 insertions, 21 deletions
diff --git a/DEPS b/DEPS
index dd2b314..49f987a 100644
--- a/DEPS
+++ b/DEPS
@@ -266,7 +266,7 @@ deps = {
"/trunk/deps/third_party/libjpeg_turbo@119959",
"src/third_party/flac":
- "/trunk/deps/third_party/flac@120064",
+ "/trunk/deps/third_party/flac@120197",
"src/third_party/pyftpdlib/src":
(Var("googlecode_url") % "pyftpdlib") + "/trunk@977",
diff --git a/tools/heapcheck/suppressions.txt b/tools/heapcheck/suppressions.txt
index b32b77d..0316970 100644
--- a/tools/heapcheck/suppressions.txt
+++ b/tools/heapcheck/suppressions.txt
@@ -1788,13 +1788,3 @@
fun:GetNumObjects
...
}
-
-{
- bug_112416
- Heapcheck:Leak
- fun:FLAC__MD5Accumulate
- fun:process_frame_
- fun:FLAC__stream_encoder_process
- fun:::FLACEncoder::Encode
- ...
-}
diff --git a/tools/valgrind/memcheck/suppressions.txt b/tools/valgrind/memcheck/suppressions.txt
index 886f9df..eea8081 100644
--- a/tools/valgrind/memcheck/suppressions.txt
+++ b/tools/valgrind/memcheck/suppressions.txt
@@ -5677,16 +5677,6 @@
...
}
{
- bug_112416
- Memcheck:Leak
- ...
- fun:FLAC__MD5Accumulate
- fun:process_frame_
- fun:FLAC__stream_encoder_process
- fun:_ZN12_GLOBAL__N_111FLACEncoder6EncodeEPKsi
- ...
-}
-{
bug_112450_a
Memcheck:Leak
fun:posix_memalign