coverity 990813 dereference after null check

(hope I got it right this time)

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@48673 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/ringbuffer.c b/ringbuffer.c
index 58cb8e14c6efe48f53434d5034135dbe4785127e..f9f1e6d67883f2d76d57fc13c0d09c30555596bd 100644 (file)
--- 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;
   }