From: Andrew Bays <andrew.bays@gmail.com>
Date: Wed, 28 Feb 2018 19:48:23 +0000 (-0500)
Subject: Move misplaced yajl_gen_map_close
X-Git-Tag: 5.10.0~18^2~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4613cd79224e68ecd6dc76aaa67f675115a7176d;p=thirdparty%2Fcollectd.git

Move misplaced yajl_gen_map_close
---

diff --git a/src/sysevent.c b/src/sysevent.c
index 49efe75c1..538618c61 100644
--- a/src/sysevent.c
+++ b/src/sysevent.c
@@ -344,9 +344,6 @@ static int gen_message_payload(const char *msg, char *sev, int sev_num,
       yajl_gen_status_ok)
     goto err;
 
-  if (yajl_gen_map_close(g) != yajl_gen_status_ok)
-    goto err;
-
   // syslogMsg
   if (msg != NULL) {
     if (yajl_gen_string(g, (u_char *)SYSEVENT_SYSLOG_MSG_FIELD,
@@ -389,6 +386,9 @@ static int gen_message_payload(const char *msg, char *sev, int sev_num,
   if (yajl_gen_string(g, (u_char *)SYSEVENT_SYSLOG_TAG_VALUE,
                       strlen(SYSEVENT_SYSLOG_TAG_VALUE)) != yajl_gen_status_ok)
     goto err;
+  
+  if (yajl_gen_map_close(g) != yajl_gen_status_ok)
+    goto err;
 
   // *** END syslog fields ***