diff --git a/ChangeLog b/ChangeLog index cfd21ebc6f..b4c28477fe 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Fri Oct 2 16:10:36 1998 Tim Janik + + * gtk/gtktypeutils.c (gtk_type_enum_find_value): make sure we don't + segfault when looking up a non-existant value name (reported by + Pablo ). + Thu Oct 1 10:40:20 1998 Tim Janik * gtk/gtkclist.h (gtk_clist_prepend): diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index cfd21ebc6f..b4c28477fe 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,9 @@ +Fri Oct 2 16:10:36 1998 Tim Janik + + * gtk/gtktypeutils.c (gtk_type_enum_find_value): make sure we don't + segfault when looking up a non-existant value name (reported by + Pablo ). + Thu Oct 1 10:40:20 1998 Tim Janik * gtk/gtkclist.h (gtk_clist_prepend): diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index cfd21ebc6f..b4c28477fe 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Fri Oct 2 16:10:36 1998 Tim Janik + + * gtk/gtktypeutils.c (gtk_type_enum_find_value): make sure we don't + segfault when looking up a non-existant value name (reported by + Pablo ). + Thu Oct 1 10:40:20 1998 Tim Janik * gtk/gtkclist.h (gtk_clist_prepend): diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index cfd21ebc6f..b4c28477fe 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +Fri Oct 2 16:10:36 1998 Tim Janik + + * gtk/gtktypeutils.c (gtk_type_enum_find_value): make sure we don't + segfault when looking up a non-existant value name (reported by + Pablo ). + Thu Oct 1 10:40:20 1998 Tim Janik * gtk/gtkclist.h (gtk_clist_prepend): diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index cfd21ebc6f..b4c28477fe 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Fri Oct 2 16:10:36 1998 Tim Janik + + * gtk/gtktypeutils.c (gtk_type_enum_find_value): make sure we don't + segfault when looking up a non-existant value name (reported by + Pablo ). + Thu Oct 1 10:40:20 1998 Tim Janik * gtk/gtkclist.h (gtk_clist_prepend): diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index cfd21ebc6f..b4c28477fe 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Fri Oct 2 16:10:36 1998 Tim Janik + + * gtk/gtktypeutils.c (gtk_type_enum_find_value): make sure we don't + segfault when looking up a non-existant value name (reported by + Pablo ). + Thu Oct 1 10:40:20 1998 Tim Janik * gtk/gtkclist.h (gtk_clist_prepend): diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index cfd21ebc6f..b4c28477fe 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Fri Oct 2 16:10:36 1998 Tim Janik + + * gtk/gtktypeutils.c (gtk_type_enum_find_value): make sure we don't + segfault when looking up a non-existant value name (reported by + Pablo ). + Thu Oct 1 10:40:20 1998 Tim Janik * gtk/gtkclist.h (gtk_clist_prepend): diff --git a/gtk/gtktypeutils.c b/gtk/gtktypeutils.c index d261fbe8e9..c5a7b1923a 100644 --- a/gtk/gtktypeutils.c +++ b/gtk/gtktypeutils.c @@ -683,18 +683,19 @@ gtk_type_enum_find_value (GtkType enum_type, GtkEnumValue *vals; vals = gtk_type_enum_get_values (enum_type); - while (vals) - { - if (strcmp (vals->value_name, value_name) == 0 || - strcmp (vals->value_nick, value_name) == 0) - return vals; - vals++; - } + if (vals) + while (vals->value_name) + { + if (strcmp (vals->value_name, value_name) == 0 || + strcmp (vals->value_nick, value_name) == 0) + return vals; + vals++; + } } else g_warning ("gtk_type_enum_find_value(): type `%s' is not derived from `GtkEnum' or `GtkFlags'", gtk_type_name (enum_type)); - + return NULL; }