From 4d6cc1dbc67eccda84d875a85e1295261ce9a26b Mon Sep 17 00:00:00 2001
From: Victor Julien <victor@inliniac.net>
Date: Tue, 22 Apr 2014 17:47:54 +0200
Subject: [PATCH] json-file: improve error handling

If the functions getting uri, etc fail. Return "unknown" instead of
NULL pointer. This improves consistency.
---
 src/output-json-file.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/output-json-file.c b/src/output-json-file.c
index db46e23b57..822f8ce398 100644
--- a/src/output-json-file.c
+++ b/src/output-json-file.c
@@ -86,9 +86,10 @@ static json_t *LogFileMetaGetUri(const Packet *p, const File *ff) {
                 if (s != NULL) {
                     js = json_string(s);
                     SCFree(s);
+                    if (js != NULL)
+                        return js;
                 }
             }
-            return js;
         }
     }
 
@@ -105,8 +106,9 @@ static json_t *LogFileMetaGetHost(const Packet *p, const File *ff) {
             if (s != NULL) {
                 js = json_string(s);
                 SCFree(s);
+                if (js != NULL)
+                    return js;
             }
-            return js;
         }
     }
 
@@ -127,8 +129,9 @@ static json_t *LogFileMetaGetReferer(const Packet *p, const File *ff) {
                 if (s != NULL) {
                     js = json_string(s);
                     SCFree(s);
+                    if (js != NULL)
+                        return js;
                 }
-                return js;
             }
         }
     }
@@ -150,8 +153,9 @@ static json_t *LogFileMetaGetUserAgent(const Packet *p, const File *ff) {
                 if (s != NULL) {
                     js = json_string(s);
                     SCFree(s);
+                    if (js != NULL)
+                        return js;
                 }
-                return js;
             }
         }
     }