From 61cad5a8e2675dc6d23cf3ed50bfda5cf1150a1e Mon Sep 17 00:00:00 2001
From: Martin Kaiser <wireshark@kaiser.cx>
Date: Sun, 31 Mar 2013 16:19:53 +0000
Subject: coverity 990813 dereference after null check (hope I got it right
 this time)

svn path=/trunk/; revision=48673
---
 ringbuffer.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'ringbuffer.c')

diff --git a/ringbuffer.c b/ringbuffer.c
index 58cb8e14c6..f9f1e6d678 100644
--- a/ringbuffer.c
+++ b/ringbuffer.c
@@ -116,8 +116,9 @@ static int ringbuf_open_file(rb_file *rfile, int *err)
   rfile->name = g_strconcat(rb_data.fprefix, "_", filenum, "_", timestr,
 			    rb_data.fsuffix, NULL);
 
-  if (rfile->name == NULL && err != NULL) {
-    *err = ENOMEM;
+  if (rfile->name == NULL) {
+    if (err != NULL)
+      *err = ENOMEM;
     return -1;
   }
 
-- 
cgit v1.2.1