2006-05-13 Matthias Clasen <mclasen@redhat.com>
+ * glib/grel.c: Fix several cases of deref-before-NULL-check.
+ (#341191, Pascal Terjan)
+
* glib/glib.symbols:
* glib/goption.h:
* glib/goption.c: Allow optional summary and description
2006-05-13 Matthias Clasen <mclasen@redhat.com>
+ * glib/grel.c: Fix several cases of deref-before-NULL-check.
+ (#341191, Pascal Terjan)
+
* glib/glib.symbols:
* glib/goption.h:
* glib/goption.c: Allow optional summary and description
gconstpointer key,
gint field)
{
- GHashTable *table = relation->hashed_tuple_tables[field];
+ GHashTable *table;
GHashTable *key_table;
- gint count = relation->count;
+ gint count;
g_return_val_if_fail (relation != NULL, 0);
+
+ table = relation->hashed_tuple_tables[field];
+ count = relation->count;
+
g_return_val_if_fail (table != NULL, 0);
key_table = g_hash_table_lookup (table, key);
gconstpointer key,
gint field)
{
- GHashTable *table = relation->hashed_tuple_tables[field];
+ GHashTable *table;
GHashTable *key_table;
- GRealTuples *tuples = g_new0 (GRealTuples, 1);
+ GRealTuples *tuples;
gint count;
g_return_val_if_fail (relation != NULL, NULL);
+
+ table = relation->hashed_tuple_tables[field];
+
g_return_val_if_fail (table != NULL, NULL);
+ tuples = g_new0 (GRealTuples, 1);
key_table = g_hash_table_lookup (table, key);
if (!key_table)
gconstpointer key,
gint field)
{
- GHashTable *table = relation->hashed_tuple_tables[field];
+ GHashTable *table;
GHashTable *key_table;
g_return_val_if_fail (relation != NULL, 0);
+
+ table = relation->hashed_tuple_tables[field];
+
g_return_val_if_fail (table != NULL, 0);
key_table = g_hash_table_lookup (table, key);