summaryrefslogtreecommitdiff
path: root/ringbuffer.c
diff options
context:
space:
mode:
authorMartin Kaiser <wireshark@kaiser.cx>2013-03-31 16:19:53 +0000
committerMartin Kaiser <wireshark@kaiser.cx>2013-03-31 16:19:53 +0000
commit61cad5a8e2675dc6d23cf3ed50bfda5cf1150a1e (patch)
treed5a3463e6052c887b7afb69edb586dd1fccda8b7 /ringbuffer.c
parentcbbf2b01e7101dd69156bc08c1399d57cdc368d0 (diff)
downloadwireshark-61cad5a8e2675dc6d23cf3ed50bfda5cf1150a1e.tar.gz
coverity 990813 dereference after null check
(hope I got it right this time) svn path=/trunk/; revision=48673
Diffstat (limited to 'ringbuffer.c')
-rw-r--r--ringbuffer.c5
1 files changed, 3 insertions, 2 deletions
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;
}