callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix another Coverity bug

Browse Source
This commit is contained in:
Matthias Clasen
2006-04-12 04:20:28 +00:00
parent 5585ce9e91
commit 4906bd0fad
4 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,5 +1,8 @@
2006-04-12 Matthias Clasen <mclasen@redhat.com> 2006-04-12 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkicontheme.c (insert_theme): Handle dirs == NULL
gracefully. (Coverity)
* gtk/gtknotebook.c (gtk_notebook_remove): Silently do nothing * gtk/gtknotebook.c (gtk_notebook_remove): Silently do nothing
if the widget is not a child. (Coverity) if the widget is not a child. (Coverity)

3
ChangeLog.pre-2-10
View File

@ -1,5 +1,8 @@
2006-04-12 Matthias Clasen <mclasen@redhat.com> 2006-04-12 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkicontheme.c (insert_theme): Handle dirs == NULL
gracefully. (Coverity)
* gtk/gtknotebook.c (gtk_notebook_remove): Silently do nothing * gtk/gtknotebook.c (gtk_notebook_remove): Silently do nothing
if the widget is not a child. (Coverity) if the widget is not a child. (Coverity)

5
gdk/x11/gdkkeys-x11.c
View File

@ -255,7 +255,10 @@ get_xkb (GdkKeymapX11 *keymap_x11)
{ {
keymap_x11->xkb_desc = XkbGetMap (xdisplay, XkbKeySymsMask | XkbKeyTypesMask | XkbModifierMapMask | XkbVirtualModsMask, XkbUseCoreKbd); keymap_x11->xkb_desc = XkbGetMap (xdisplay, XkbKeySymsMask | XkbKeyTypesMask | XkbModifierMapMask | XkbVirtualModsMask, XkbUseCoreKbd);
if (keymap_x11->xkb_desc == NULL) if (keymap_x11->xkb_desc == NULL)
g_error ("Failed to get keymap"); {
g_error ("Failed to get keymap");
return NULL;
}
XkbGetNames (xdisplay, XkbGroupNamesMask | XkbVirtualModNamesMask, keymap_x11->xkb_desc); XkbGetNames (xdisplay, XkbGroupNamesMask | XkbVirtualModNamesMask, keymap_x11->xkb_desc);

11
gtk/gtkicontheme.c
View File

@ -987,11 +987,12 @@ insert_theme (GtkIconTheme *icon_theme, const char *theme_name)
NULL); NULL);
theme->dirs = NULL; theme->dirs = NULL;
for (i = 0; dirs[i] != NULL; i++) if (dirs)
theme_subdir_load (icon_theme, theme, theme_file, dirs[i]); {
for (i = 0; dirs[i] != NULL; i++)
g_strfreev (dirs); theme_subdir_load (icon_theme, theme, theme_file, dirs[i]);
g_strfreev (dirs);
}
theme->dirs = g_list_reverse (theme->dirs); theme->dirs = g_list_reverse (theme->dirs);
themes = g_key_file_get_string_list (theme_file, themes = g_key_file_get_string_list (theme_file,