[glib] GDataSet: silently accept NULL/0 as keys
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib] GDataSet: silently accept NULL/0 as keys
- Date: Thu, 2 Oct 2014 18:41:34 +0000 (UTC)
commit f6a9d0479622593c8339346b7298ca04f31a56be
Author: Matthias Clasen <mclasen redhat com>
Date: Thu Oct 2 14:40:16 2014 -0400
GDataSet: silently accept NULL/0 as keys
This used to be the behaviour before we made these functions
threadsafe; keep it that way.
https://bugzilla.gnome.org/show_bug.cgi?id=737741
glib/gdataset.c | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
---
diff --git a/glib/gdataset.c b/glib/gdataset.c
index f054d32..4c02d36 100644
--- a/glib/gdataset.c
+++ b/glib/gdataset.c
@@ -850,7 +850,6 @@ g_datalist_id_dup_data (GData **datalist,
GDataElt *data, *data_end;
g_return_val_if_fail (datalist != NULL, NULL);
- g_return_val_if_fail (key_id != 0, NULL);
g_datalist_lock (datalist);
@@ -1029,7 +1028,7 @@ g_datalist_get_data (GData **datalist,
data_end = data + d->len;
while (data < data_end)
{
- if (strcmp (g_quark_to_string (data->key), key) == 0)
+ if (g_strcmp0 (g_quark_to_string (data->key), key) == 0)
{
res = data->data;
break;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]