aboutsummaryrefslogtreecommitdiffstats
path: root/ringbuffer.c
diff options
context:
space:
mode:
authorMartin Kaiser <wireshark@kaiser.cx>2013-03-13 22:39:50 +0000
committerMartin Kaiser <wireshark@kaiser.cx>2013-03-13 22:39:50 +0000
commit95ab41e938994c55c58caf350ff909d9b443988a (patch)
treeb99bedbfc4af8f065cfc2af13bef1d03154ea4f6 /ringbuffer.c
parent04766017dfe4ddb9192f832f8caffa8187073333 (diff)
add missing NULL check
http://www.wireshark.org/download/automated/analysis/scan-build-2013-03-12-1/report-q1cLLC.html#EndPath svn path=/trunk/; revision=48283
Diffstat (limited to 'ringbuffer.c')
-rw-r--r--ringbuffer.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ringbuffer.c b/ringbuffer.c
index beffca5a24..58cb8e14c6 100644
--- a/ringbuffer.c
+++ b/ringbuffer.c
@@ -116,7 +116,7 @@ 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) {
+ if (rfile->name == NULL && err != NULL) {
*err = ENOMEM;
return -1;
}