summaryrefslogtreecommitdiff
path: root/src/libtracker-sparql/core/tracker-sparql.c
diff options
context:
space:
mode:
authorSam Thursfield <sam@afuera.me.uk>2023-05-04 12:13:30 +0000
committerSam Thursfield <sam@afuera.me.uk>2023-05-04 12:13:30 +0000
commitbf58f527008eb4ad725f5a0ad457c7d404b123c7 (patch)
tree14e50ccb18c040823fffb6b7b24ee6c5d25faab1 /src/libtracker-sparql/core/tracker-sparql.c
parent0619c65273da0ca2644e43596fe3d61c1d8b0737 (diff)
parent18217f0545e4c20a9d41424d62a6fe6be53788dd (diff)
downloadtracker-bf58f527008eb4ad725f5a0ad457c7d404b123c7.tar.gz
Merge branch 'wip/carlosg/crash-fixes' into 'master'
Fix some potential crashers See merge request https://gitlab.gnome.org/GNOME/tracker/-/merge_requests/594
Diffstat (limited to 'src/libtracker-sparql/core/tracker-sparql.c')
-rw-r--r--src/libtracker-sparql/core/tracker-sparql.c14
1 files changed, 9 insertions, 5 deletions
diff --git a/src/libtracker-sparql/core/tracker-sparql.c b/src/libtracker-sparql/core/tracker-sparql.c
index 745ed46b3..064102a20 100644
--- a/src/libtracker-sparql/core/tracker-sparql.c
+++ b/src/libtracker-sparql/core/tracker-sparql.c
@@ -9920,9 +9920,11 @@ init_literal_token_from_gvalue (TrackerToken *resolved_out,
const GValue *value)
{
if (G_VALUE_TYPE (value) == G_TYPE_STRING) {
- tracker_token_literal_init (resolved_out,
- g_value_get_string (value),
- -1);
+ const gchar *str;
+
+ str = g_value_get_string (value);
+ if (str)
+ tracker_token_literal_init (resolved_out, str, -1);
} else if (G_VALUE_TYPE (value) == G_TYPE_INT64) {
gchar *str;
str = g_strdup_printf ("%" G_GINT64_FORMAT,
@@ -9942,8 +9944,10 @@ init_literal_token_from_gvalue (TrackerToken *resolved_out,
gchar *str;
str = tracker_date_format_iso8601 (g_value_get_boxed (value));
- tracker_token_literal_init (resolved_out, str, -1);
- g_free (str);
+ if (str) {
+ tracker_token_literal_init (resolved_out, str, -1);
+ g_free (str);
+ }
} else if (G_VALUE_TYPE (value) != G_TYPE_INVALID) {
g_assert_not_reached ();
}