Add cleri children check so it is compatible with the latest version
authorJeroen van der Heijden <jeroen@transceptor.technology>
Thu, 1 Nov 2018 10:59:26 +0000 (11:59 +0100)
committerJeroen van der Heijden <jeroen@transceptor.technology>
Thu, 1 Nov 2018 10:59:26 +0000 (11:59 +0100)
src/siri/db/aggregate.c
src/siri/db/listener.c

index 5ea3ed1cd51a54c06c25139c85bb25d1368d4e11..0cfc7ec542ae281c722b0ebb4329780440b66589 100644 (file)
@@ -339,7 +339,7 @@ vec_t * siridb_aggregate_list(cleri_children_t * children, char * err_msg)
                 cleri_node_t * dlist = children->node->children->
                         node->children->next->next->node;
 
-                if (dlist->children->node != NULL)
+                if (dlist->children != NULL && dlist->children->node != NULL)
                 {
                     /* result is at least positive, checked earlier */
                     aggr->timespan =
index 1128157dd7a14d60c2e0efc2b6f2b8e386972d92..b335ab34d3110a92ba2be93b8b57b97ba01459b4 100644 (file)
@@ -4249,7 +4249,7 @@ static void exit_show_stmt(uv_async_t * handle)
     /* set props.h (who_am_i) to current db_name */
     who_am_i = db_user->name;
 
-    if (children->node == NULL)
+    if (children == NULL || children->node == NULL)
     {
         /* show all properties */
         int i;