# HG changeset patch
# User Matt Coates <mfcoates@cert.org>
# Date 1573161269 18000
#      Thu Nov 07 16:14:29 2019 -0500
# Node ID 16be779367330c298fb2723d0f36dec1e3d18d28
# Parent  d54749b767893fb12fd8d5fbfa92cbb1b58b20d8
JSON formatting bugfix for empty SSL DPI IPFIX records

diff -r d54749b76789 -r 16be77936733 src/mediator_export.c
--- a/src/mediator_export.c	Mon Sep 23 15:28:33 2019 -0400
+++ b/src/mediator_export.c	Thu Nov 07 16:14:29 2019 -0500
@@ -5719,6 +5719,9 @@
     if (fbSubTemplateListGetIndexedDataPtr(&cert->issuer, 0)) {
         ret = snprintf(buf->cp, brem, "{\"sslCertIssuer\":{");
         MD_CHECK_RET(buf, ret, brem);
+    }else{
+        g_string_free(ou_str, TRUE);
+            return TRUE;
     }
 
     while ((obj = (yaf_subssl_t *)FBSTLNEXT(&(cert->issuer),
@@ -5932,7 +5935,7 @@
 
     /* print cert version */
 
-    if (mdExporterCheckSSLConfig(exporter, 189, 3)) {
+    if (cert->sslCertVersion && mdExporterCheckSSLConfig(exporter, 189, 3)) {
         snprintf(ssl_buffer, sizeof(ssl_buffer), "%d", cert->sslCertVersion);
         rv = exporter->VLprint_fn(exporter, (uint8_t *)ssl_buffer,
                                   SSL_DEFAULT, NULL, 0, 189, strlen(ssl_buffer),
diff -r d54749b76789 -r 16be77936733 src/mediator_open.c
--- a/src/mediator_open.c	Mon Sep 23 15:28:33 2019 -0400
+++ b/src/mediator_open.c	Thu Nov 07 16:14:29 2019 -0500
@@ -1590,6 +1590,9 @@
             fBufFree(cnode->fbuf);
         }
 
+        /* this collector's listener could be NULL when called during configuration
+         * to deconflict CLI options and config file collectors.
+         */
         if (cnode->coll->type == TCP && cnode->coll->listener != NULL) {
             fbListenerFree(cnode->coll->listener);
         }