diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-25 17:03:36 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-25 17:03:36 +0000 |
| commit | e2a70f76250f3d46fd5b3f73c1bd56cfe622201e (patch) | |
| tree | 07a0d641b14bf31c6752d9729c22c7196eecc9af | |
| parent | be5c675aee63157fee45313c237b4ad043a68c2b (diff) | |
| download | chromium_src-e2a70f76250f3d46fd5b3f73c1bd56cfe622201e.zip chromium_src-e2a70f76250f3d46fd5b3f73c1bd56cfe622201e.tar.gz chromium_src-e2a70f76250f3d46fd5b3f73c1bd56cfe622201e.tar.bz2 | |
Fixes a couple of leaks in use of gdk_get_property.
BUG=44945
TEST=none
Review URL: http://codereview.chromium.org/2089024
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48161 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/gtk/tab_contents_drag_source.cc | 1 | ||||
| -rw-r--r-- | tools/valgrind/memcheck/suppressions.txt | 9 | ||||
| -rw-r--r-- | views/screen_gtk.cc | 1 |
3 files changed, 2 insertions, 9 deletions
diff --git a/chrome/browser/gtk/tab_contents_drag_source.cc b/chrome/browser/gtk/tab_contents_drag_source.cc index ffd914e..8bb4402 100644 --- a/chrome/browser/gtk/tab_contents_drag_source.cc +++ b/chrome/browser/gtk/tab_contents_drag_source.cc @@ -228,6 +228,7 @@ void TabContentsDragSource::OnDragDataGet(GtkWidget* sender, // Convert from the file url to the file path. GURL file_url(std::string(reinterpret_cast<char*>(file_url_value), file_url_len)); + g_free(file_url_value); FilePath file_path; if (net::FileURLToFilePath(file_url, &file_path)) { // Open the file as a stream. diff --git a/tools/valgrind/memcheck/suppressions.txt b/tools/valgrind/memcheck/suppressions.txt index 24950f4..484badb 100644 --- a/tools/valgrind/memcheck/suppressions.txt +++ b/tools/valgrind/memcheck/suppressions.txt @@ -2946,15 +2946,6 @@ fun:_ZN85_GLOBAL__N_chrome_renderer_extensions_extension_process_bindings.cc_00000000_F8ABDBBA13ExtensionImpl12StartRequestERKN2v89ArgumentsE } { - bug_44945 - Memcheck:Leak - fun:malloc - fun:g_malloc - fun:gdk_property_get - fun:_ZN5views23GetPrimaryMonitorBoundsEv - fun:_ZN5views6Screen31GetMonitorWorkAreaNearestWindowEP10_GtkWidget -} -{ bug_44966 Memcheck:Addr8 fun:event_del diff --git a/views/screen_gtk.cc b/views/screen_gtk.cc index 93518b4..05076d7 100644 --- a/views/screen_gtk.cc +++ b/views/screen_gtk.cc @@ -37,6 +37,7 @@ gfx::Rect static GetPrimaryMonitorBounds() { top_left_y = data[1]; width = data[2]; height = data[3]; + g_free(raw_data); } else { // If there's no window manager, we can ask X for Monitor info directly. XWindowAttributes attributes; |