From 947fc3509b415af647bd39dd2d5972c4a508bb99 Mon Sep 17 00:00:00 2001
From: Mark Riddoch <mriddoch@ks211278.kimsufi.com>
Date: Wed, 25 Sep 2013 17:50:12 +0200
Subject: [PATCH] Make configuration file reading more robust

---
 server/core/config.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/server/core/config.c b/server/core/config.c
index 7ef444fb3..cc3d2c250 100644
--- a/server/core/config.c
+++ b/server/core/config.c
@@ -85,6 +85,7 @@ CONFIG_PARAMETER	*param;
 		ptr->object = strdup(section);
 		ptr->parameters = NULL;
 		ptr->next = cntxt->next;
+		ptr->element = NULL;
 		cntxt->next = ptr;
 	}
 	if ((param = (CONFIG_PARAMETER *)malloc(sizeof(CONFIG_PARAMETER))) == NULL)
@@ -188,6 +189,7 @@ int			error_count = 0;
 			}
 			else
 			{
+				obj->element = NULL;
 				skygw_log_write( LOGFILE_ERROR, "No router defined for service '%s'\n",
 							obj->object);
 				error_count++;
@@ -465,8 +467,11 @@ SERVER			*server;
 				}
 			}
 			else
+			{
+				obj->element = NULL;
 				skygw_log_write( LOGFILE_ERROR, "No router defined for service '%s'\n",
 							obj->object);
+			}
 		}
 		else if (!strcmp(type, "server"))
 		{