log.c:__lxc_log_set_file: fname cannot be null

fname cannot be passed in as NULL by any of its current callers. If it could, then build_dir() would crash as it doesn't check for it. So make sure we are warned if in the future we pass in NULL. Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>

log.c:__lxc_log_set_file: fname cannot be null
ef1ba04c · Serge Hallyn · Stéphane Graber · 8ab1f94b · ef1ba04c
Commit ef1ba04c authored Feb 15, 2016 by Serge Hallyn Committed by Stéphane Graber Nov 17, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

log.c src/lxc/log.c +4 -1

No files found.
--- a/src/lxc/log.c
+++ b/src/lxc/log.c
@@ -20,6 +20,7 @@
 * License along with this library; if not, write to the Free Software
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */
+#include <assert.h>
 #include <stdio.h>
 #include <errno.h>
 #include <limits.h>
@@ -266,7 +267,9 @@ static int __lxc_log_set_file(const char *fname, int create_dirs)
 		free(log_fname);
 	}

-	if (!fname || strlen(fname) == 0) {
+	assert(fname != NULL);
+
+	if (strlen(fname) == 0) {
 		log_fname = NULL;
 		return 0;
 	}