store: Let the JSON formatter know about arrays at top level.

[sysdb.git] / src / frontend / parser.c

diff --git a/src/frontend/parser.c b/src/frontend/parser.c
index b0ae01a55bf618ee02f44e3098c290dec273c383..785b7e40b59caecc3f34d5e8660f7d04f918e397 100644 (file)
--- a/src/frontend/parser.c
+++ b/src/frontend/parser.c
@@ -112,15 +112,18 @@ sdb_fe_parse_matcher(const char *cond, int len)
        }
 
        node = SDB_CONN_NODE(sdb_llist_get(yyextra.parsetree, 0));
-       if (! node)
+       if (! node) {
+               sdb_llist_destroy(yyextra.parsetree);
                return NULL;
+       }
 
-       if (node->cmd == CONNECTION_MATCHER)
+       if (node->cmd == CONNECTION_MATCHER) {
                m = CONN_MATCHER(node)->matcher;
+               CONN_MATCHER(node)->matcher = NULL;
+       }
        else
                m = NULL;
 
-       CONN_MATCHER(node)->matcher = NULL;
        sdb_llist_destroy(yyextra.parsetree);
        sdb_object_deref(SDB_OBJ(node));
        return m;
@@ -151,15 +154,18 @@ sdb_fe_parse_expr(const char *expr, int len)
        }
 
        node = SDB_CONN_NODE(sdb_llist_get(yyextra.parsetree, 0));
-       if (! node)
+       if (! node) {
+               sdb_llist_destroy(yyextra.parsetree);
                return NULL;
+       }
 
-       if (node->cmd == CONNECTION_EXPR)
+       if (node->cmd == CONNECTION_EXPR) {
                e = CONN_EXPR(node)->expr;
+               CONN_EXPR(node)->expr = NULL;
+       }
        else
                e = NULL;
 
-       CONN_EXPR(node)->expr = NULL;
        sdb_llist_destroy(yyextra.parsetree);
        sdb_object_deref(SDB_OBJ(node));
        return e;