From: Jeroen van der Heijden <jeroen@transceptor.technology>
Date: Thu, 1 Nov 2018 10:59:26 +0000 (+0100)
Subject: Add cleri children check so it is compatible with the latest version
X-Git-Tag: archive/raspbian/2.0.44-1+rpi1~1^2~3^2~7^2~2^2~22^2~2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=a1b2a95157d746d58afaff5510be90297e2fa1d7;p=siridb-server.git

Add cleri children check so it is compatible with the latest version
---

diff --git a/src/siri/db/aggregate.c b/src/siri/db/aggregate.c
index 5ea3ed1c..0cfc7ec5 100644
--- a/src/siri/db/aggregate.c
+++ b/src/siri/db/aggregate.c
@@ -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 =
diff --git a/src/siri/db/listener.c b/src/siri/db/listener.c
index 1128157d..b335ab34 100644
--- a/src/siri/db/listener.c
+++ b/src/siri/db/listener.c
@@ -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;