AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-11-13 04:10:13 +00:00
Code Issues Projects Releases Wiki Activity

Fix memory leak in case of mismatched property type.

Browse Source 
Thu Feb 26 19:48:39 2004  Owen Taylor  <otaylor@redhat.com>

        * gdk/x11/xsettings-client.c (read_settings): Fix memory leak
        in case of mismatched property type.
This commit is contained in:
Owen Taylor 2004-02-27 00:52:45 +00:00 committed by Owen Taylor
parent d40eda7e87
commit 4528eae1f3
6 changed files with 31 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Thu Feb 26 19:48:39 2004 Owen Taylor <otaylor@redhat.com>
* gdk/x11/xsettings-client.c (read_settings): Fix memory leak
in case of mismatched property type.
Thu Feb 26 18:25:57 2004 Jonathan Blandford <jrb@gnome.org> Thu Feb 26 18:25:57 2004 Jonathan Blandford <jrb@gnome.org>
* gtk/gtkfilechooser.h (GtkFileChooserAction): Add two more folder * gtk/gtkfilechooser.h (GtkFileChooserAction): Add two more folder

5
ChangeLog.pre-2-10
View File

@ -1,3 +1,8 @@
Thu Feb 26 19:48:39 2004 Owen Taylor <otaylor@redhat.com>
* gdk/x11/xsettings-client.c (read_settings): Fix memory leak
in case of mismatched property type.
Thu Feb 26 18:25:57 2004 Jonathan Blandford <jrb@gnome.org> Thu Feb 26 18:25:57 2004 Jonathan Blandford <jrb@gnome.org>
* gtk/gtkfilechooser.h (GtkFileChooserAction): Add two more folder * gtk/gtkfilechooser.h (GtkFileChooserAction): Add two more folder

5
ChangeLog.pre-2-4
View File

@ -1,3 +1,8 @@
Thu Feb 26 19:48:39 2004 Owen Taylor <otaylor@redhat.com>
* gdk/x11/xsettings-client.c (read_settings): Fix memory leak
in case of mismatched property type.
Thu Feb 26 18:25:57 2004 Jonathan Blandford <jrb@gnome.org> Thu Feb 26 18:25:57 2004 Jonathan Blandford <jrb@gnome.org>
* gtk/gtkfilechooser.h (GtkFileChooserAction): Add two more folder * gtk/gtkfilechooser.h (GtkFileChooserAction): Add two more folder

5
ChangeLog.pre-2-6
View File

@ -1,3 +1,8 @@
Thu Feb 26 19:48:39 2004 Owen Taylor <otaylor@redhat.com>
* gdk/x11/xsettings-client.c (read_settings): Fix memory leak
in case of mismatched property type.
Thu Feb 26 18:25:57 2004 Jonathan Blandford <jrb@gnome.org> Thu Feb 26 18:25:57 2004 Jonathan Blandford <jrb@gnome.org>
* gtk/gtkfilechooser.h (GtkFileChooserAction): Add two more folder * gtk/gtkfilechooser.h (GtkFileChooserAction): Add two more folder

5
ChangeLog.pre-2-8
View File

@ -1,3 +1,8 @@
Thu Feb 26 19:48:39 2004 Owen Taylor <otaylor@redhat.com>
* gdk/x11/xsettings-client.c (read_settings): Fix memory leak
in case of mismatched property type.
Thu Feb 26 18:25:57 2004 Jonathan Blandford <jrb@gnome.org> Thu Feb 26 18:25:57 2004 Jonathan Blandford <jrb@gnome.org>
* gtk/gtkfilechooser.h (GtkFileChooserAction): Add two more folder * gtk/gtkfilechooser.h (GtkFileChooserAction): Add two more folder

8
gdk/x11/xsettings-client.c
View File

@ -383,9 +383,13 @@ read_settings (XSettingsClient *client)
&type, &format, &n_items, &bytes_after, &data); &type, &format, &n_items, &bytes_after, &data);
XSetErrorHandler (old_handler); XSetErrorHandler (old_handler);
if (result == Success && type == client->xsettings_atom) if (result == Success && type != None)
{ {
if (format != 8) if (type != client->xsettings_atom)
{
fprintf (stderr, "Invalid type for XSETTINGS property");
}
eles if (format != 8)
{ {
fprintf (stderr, "Invalid format for XSETTINGS property %d", format); fprintf (stderr, "Invalid format for XSETTINGS property %d", format);
} }