From d2e2773146c2a412fab2487c0bc8ef605f45d5b8 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Mon, 19 Nov 2001 16:31:34 +0000 Subject: [PATCH] Fix a memory leak when retrieving atom names. (Michael Meeks, #64508) Mon Nov 19 11:30:03 2001 Owen Taylor * gdk/x11/gdkproperty-x11.c (get_atom_name): Fix a memory leak when retrieving atom names. (Michael Meeks, #64508) --- ChangeLog | 6 ++++++ ChangeLog.pre-2-0 | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-2 | 6 ++++++ ChangeLog.pre-2-4 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ gdk/x11/gdkproperty-x11.c | 2 +- 8 files changed, 43 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 5eeecce69a..25bfc13e4c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Mon Nov 19 11:30:03 2001 Owen Taylor + + * gdk/x11/gdkproperty-x11.c (get_atom_name): Fix a + memory leak when retrieving atom names. (Michael Meeks, + #64508) + 2001-11-18 Alex Larsson * gdk/x11/gdkfont-x11.c (gdk_font_from_description): diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 5eeecce69a..25bfc13e4c 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,9 @@ +Mon Nov 19 11:30:03 2001 Owen Taylor + + * gdk/x11/gdkproperty-x11.c (get_atom_name): Fix a + memory leak when retrieving atom names. (Michael Meeks, + #64508) + 2001-11-18 Alex Larsson * gdk/x11/gdkfont-x11.c (gdk_font_from_description): diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 5eeecce69a..25bfc13e4c 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Mon Nov 19 11:30:03 2001 Owen Taylor + + * gdk/x11/gdkproperty-x11.c (get_atom_name): Fix a + memory leak when retrieving atom names. (Michael Meeks, + #64508) + 2001-11-18 Alex Larsson * gdk/x11/gdkfont-x11.c (gdk_font_from_description): diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 5eeecce69a..25bfc13e4c 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +Mon Nov 19 11:30:03 2001 Owen Taylor + + * gdk/x11/gdkproperty-x11.c (get_atom_name): Fix a + memory leak when retrieving atom names. (Michael Meeks, + #64508) + 2001-11-18 Alex Larsson * gdk/x11/gdkfont-x11.c (gdk_font_from_description): diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 5eeecce69a..25bfc13e4c 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Mon Nov 19 11:30:03 2001 Owen Taylor + + * gdk/x11/gdkproperty-x11.c (get_atom_name): Fix a + memory leak when retrieving atom names. (Michael Meeks, + #64508) + 2001-11-18 Alex Larsson * gdk/x11/gdkfont-x11.c (gdk_font_from_description): diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 5eeecce69a..25bfc13e4c 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Mon Nov 19 11:30:03 2001 Owen Taylor + + * gdk/x11/gdkproperty-x11.c (get_atom_name): Fix a + memory leak when retrieving atom names. (Michael Meeks, + #64508) + 2001-11-18 Alex Larsson * gdk/x11/gdkfont-x11.c (gdk_font_from_description): diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 5eeecce69a..25bfc13e4c 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Mon Nov 19 11:30:03 2001 Owen Taylor + + * gdk/x11/gdkproperty-x11.c (get_atom_name): Fix a + memory leak when retrieving atom names. (Michael Meeks, + #64508) + 2001-11-18 Alex Larsson * gdk/x11/gdkfont-x11.c (gdk_font_from_description): diff --git a/gdk/x11/gdkproperty-x11.c b/gdk/x11/gdkproperty-x11.c index c242b6bea2..c2cdaf7341 100644 --- a/gdk/x11/gdkproperty-x11.c +++ b/gdk/x11/gdkproperty-x11.c @@ -263,7 +263,7 @@ get_atom_name (GdkAtom atom) virtual_atom_check_init (); if (ATOM_TO_INDEX (atom) < virtual_atom_array->len) - return g_strdup (g_ptr_array_index (virtual_atom_array, ATOM_TO_INDEX (atom))); + return g_ptr_array_index (virtual_atom_array, ATOM_TO_INDEX (atom)); else return NULL; }