[tracker/wip/carlosg/sparql1.1: 170/201] libtracker-data: Only restore token if necessary

[Carlos Garnacho <carlosg src gnome org>]

commit 75ceff11302b8eac64bebe1bdede6a9a18d5ea6a
Author: Carlos Garnacho <carlosg gnome org>
Date:   Wed Jul 17 02:17:26 2019 +0200

    libtracker-data: Only restore token if necessary
    
    Doing this is no longer ok since the TrackerToken may hold
    non-static memory. Ensure we don't unset the wrong token in that
    case.

 src/libtracker-data/tracker-sparql.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/src/libtracker-data/tracker-sparql.c b/src/libtracker-data/tracker-sparql.c
index 7b398cbeb..d17a904cd 100644
--- a/src/libtracker-data/tracker-sparql.c
+++ b/src/libtracker-data/tracker-sparql.c
@@ -3867,6 +3867,7 @@ translate_InsertClause (TrackerSparql  *sparql,
                         GError        **error)
 {
        TrackerToken old_graph;
+       gboolean into = FALSE;
 
        /* InsertClause ::= 'INSERT' QuadPattern
         *
@@ -3881,8 +3882,6 @@ translate_InsertClause (TrackerSparql  *sparql,
        sparql->current_state.blank_node_map =
                g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free);
 
-       old_graph = sparql->current_state.graph;
-
        sparql->current_state.type = TRACKER_SPARQL_TYPE_INSERT;
        _expect (sparql, RULE_TYPE_LITERAL, LITERAL_INSERT);
 
@@ -3896,15 +3895,19 @@ translate_InsertClause (TrackerSparql  *sparql,
        sparql->silent = _accept (sparql, RULE_TYPE_LITERAL, LITERAL_SILENT);
 
        if (_accept (sparql, RULE_TYPE_LITERAL, LITERAL_INTO)) {
+               old_graph = sparql->current_state.graph;
                _call_rule (sparql, NAMED_RULE_iri, error);
                _init_token (&sparql->current_state.graph,
                             sparql->current_state.prev_node, sparql);
+               into = TRUE;
        }
 
        _call_rule (sparql, NAMED_RULE_QuadPattern, error);
 
-       tracker_token_unset (&sparql->current_state.graph);
-       sparql->current_state.graph = old_graph;
+       if (into) {
+               tracker_token_unset (&sparql->current_state.graph);
+               sparql->current_state.graph = old_graph;
+       }
 
        if (sparql->blank_nodes) {
                g_variant_builder_close (sparql->blank_nodes);