summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2006-04-11 16:26:26 +0000
committerMatthias Clasen <matthiasc@src.gnome.org>2006-04-11 16:26:26 +0000
commit371ce39cfcd21d98cd53dbe50922bd3595986cf9 (patch)
treece468dfb3feda34964c154b284648c246daf7c14
parent383f83c102282e8421ce7632dd17575950d9b6d5 (diff)
downloadgtk+-371ce39cfcd21d98cd53dbe50922bd3595986cf9.tar.gz
Don't dereference info before checking it for NULL. (Coverity)
2006-04-11 Matthias Clasen <mclasen@redhat.com> * gtk/gtkinputdialog.c (gtk_input_dialog_set_mapping_mode): Don't dereference info before checking it for NULL. (Coverity)
-rw-r--r--ChangeLog5
-rw-r--r--ChangeLog.pre-2-105
-rw-r--r--gtk/gtkinputdialog.c4
3 files changed, 13 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index e5870a0984..25581bc0cf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-04-11 Matthias Clasen <mclasen@redhat.com>
+
+ * gtk/gtkinputdialog.c (gtk_input_dialog_set_mapping_mode): Don't
+ dereference info before checking it for NULL. (Coverity)
+
2006-04-11 Anders Carlsson <andersca@mac.imendio.com>
* gdk/quartz/GdkQuartzView.c:
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index e5870a0984..25581bc0cf 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2006-04-11 Matthias Clasen <mclasen@redhat.com>
+
+ * gtk/gtkinputdialog.c (gtk_input_dialog_set_mapping_mode): Don't
+ dereference info before checking it for NULL. (Coverity)
+
2006-04-11 Anders Carlsson <andersca@mac.imendio.com>
* gdk/quartz/GdkQuartzView.c:
diff --git a/gtk/gtkinputdialog.c b/gtk/gtkinputdialog.c
index 397b700356..9f7b03f5bb 100644
--- a/gtk/gtkinputdialog.c
+++ b/gtk/gtkinputdialog.c
@@ -454,11 +454,13 @@ gtk_input_dialog_set_mapping_mode (GtkWidget *w,
{
GtkInputDialog *inputd = input_dialog_from_widget (w);
GdkDevice *info = inputd->current_device;
- GdkInputMode old_mode = info->mode;
+ GdkInputMode old_mode;
GdkInputMode mode = GPOINTER_TO_INT (data);
if (!info)
return;
+
+ old_mode = info->mode;
if (mode != old_mode)
{