diff options
| author | Carlos Garnacho <carlosg@gnome.org> | 2016-06-05 01:44:12 +0200 |
|---|---|---|
| committer | Carlos Garnacho <carlosg@gnome.org> | 2016-06-21 14:33:53 +0200 |
| commit | 003f7fdd96e3c3e2588de64a69c889f848e912ec (patch) | |
| tree | 88db5110ab65531b1680c84ffaf686a59157031f | |
| parent | 63e507865d661fee59a6e9c789cffa7d1073017e (diff) | |
| download | tracker-003f7fdd96e3c3e2588de64a69c889f848e912ec.tar.gz | |
libtracker-data: Ensure variables are defined in aggregate expressions
Look those up and error out if they are undefined.
https://bugzilla.gnome.org/show_bug.cgi?id=759361
| -rw-r--r-- | src/libtracker-data/tracker-sparql-expression.vala | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/libtracker-data/tracker-sparql-expression.vala b/src/libtracker-data/tracker-sparql-expression.vala index 96270cfc5..210fdff84 100644 --- a/src/libtracker-data/tracker-sparql-expression.vala +++ b/src/libtracker-data/tracker-sparql-expression.vala @@ -1687,7 +1687,17 @@ class Tracker.Sparql.Expression : Object { if (accept (SparqlTokenType.DISTINCT)) { sql.append ("DISTINCT "); } + + bool is_var = (current () == SparqlTokenType.VAR); var optype = translate_expression (sql); + + if (is_var) { + var variable = context.get_variable (get_last_string ().substring (1)); + if (variable.binding == null) { + throw get_error ("use of undefined variable `%s'".printf (variable.name)); + } + } + expect (SparqlTokenType.CLOSE_PARENS); return optype; } |