From: Victor Julien <victor@inliniac.net>
Date: Wed, 4 Jun 2014 14:54:56 +0000 (+0200)
Subject: Fix Coverity 1220097
X-Git-Tag: suricata-2.0.2~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8a77e6bc8e6677b2bdf7205891073b9bfb7055ef;p=thirdparty%2Fsuricata.git

Fix Coverity 1220097

*** CID 1220097:  Missing unlock  (LOCK)
/src/log-file.c: 160 in LogFileWriteJsonRecord()
154             }
155         }
156
157         /* Bail early if no file pointer to write to (in the unlikely
158          * event file rotation failed. */
159         if (aft->file_ctx->fp == NULL) {
>>>     CID 1220097:  Missing unlock  (LOCK)
>>>     Returning without unlocking "aft->file_ctx->fp_mutex".
160             return;
161         }
162
163         FILE *fp = aft->file_ctx->fp;
164         char timebuf[64];
165         AppProto alproto = FlowGetAppProtocol(p->flow);
---

diff --git a/src/log-file.c b/src/log-file.c
index 3c5bcd9c7c..1cf10b584c 100644
--- a/src/log-file.c
+++ b/src/log-file.c
@@ -157,6 +157,7 @@ static void LogFileWriteJsonRecord(LogFileLogThread *aft, const Packet *p, const
     /* Bail early if no file pointer to write to (in the unlikely
      * event file rotation failed. */
     if (aft->file_ctx->fp == NULL) {
+        SCMutexUnlock(&aft->file_ctx->fp_mutex);
         return;
     }