From e5a43605ba1dc7a0843eaafcc3f9090639bd9169 Mon Sep 17 00:00:00 2001 From: Tomohiro Kusumi Date: Tue, 28 Mar 2017 23:02:49 +0300 Subject: [PATCH] Fix return value of make_filename() when no filename_format This is unlikely to happen in the first place since ->filename_format has a default value, and option parser can also detect an empty string, but it should return buf which is sprintf'd right before returning. A caller expects this function to return filename string (which is buf arg itself in this case), and it also doesn't handle NULL return. Signed-off-by: Tomohiro Kusumi Signed-off-by: Jens Axboe --- init.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/init.c b/init.c index 4a722555..6af6c450 100644 --- a/init.c +++ b/init.c @@ -1121,7 +1121,7 @@ static char *make_filename(char *buf, size_t buf_size,struct thread_options *o, if (!o->filename_format || !strlen(o->filename_format)) { sprintf(buf, "%s.%d.%d", jobname, jobnum, filenum); - return NULL; + return buf; } for (f = &fpre_keywords[0]; f->keyword; f++) -- 2.25.1