config: handle syntax error instead of dereferencing NULL pointer

1 files changed, 12 insertions, 2 deletions

diff --git a/src/util/configuration.c b/src/util/configuration.c
index e515c7c46..8553d2b61 100644
--- a/src/util/configuration.c
+++ b/src/util/configuration.c
@@ -616,7 +616,7 @@ handle_inline (struct GNUNET_CONFIGURATION_Handle *cfg,
   {
     fun_ret = GNUNET_OK;
   }
-cleanup:
+  cleanup:
   cfg->current_nest_level = old_nest_level;
   if (NULL != other_cfg)
     GNUNET_CONFIGURATION_destroy (other_cfg);
@@ -890,6 +890,16 @@ GNUNET_CONFIGURATION_deserialize (struct GNUNET_CONFIGURATION_Handle *cfg,
     {
       size_t i;
 
+      if (NULL == section)
+      {
+        LOG (GNUNET_ERROR_TYPE_WARNING,
+             _ (
+               "Syntax error while deserializing in line %u (option without section)\n"),
+             nr);
+        ret = GNUNET_SYSERR;
+        break;
+      }
+
       /* tag = value */
       tag = GNUNET_strndup (line, eq - line);
       /* remove tailing whitespace */
@@ -2300,7 +2310,7 @@ GNUNET_CONFIGURATION_load_from (struct GNUNET_CONFIGURATION_Handle *cfg,
     if (fun_ret != GNUNET_OK)
       break;
   }
-cleanup:
+  cleanup:
   if (files_context.files_length > 0)
   {
     for (size_t i = 0; i < files_context.files_length; i++)