blob: 9487b172f1e907aea5eecae14456a5776782bcb1 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
|
From c4ac8d370d3a842e32756481ee594bacfe1f5059 Mon Sep 17 00:00:00 2001
From: Dmitry Rozhkov <dmitry.rozhkov@linux.intel.com>
Date: Wed, 13 Apr 2016 10:11:51 +0300
Subject: [PATCH] log.c: Check filename for NULL before logging it
In many error situations a fake file struct is passed to
the logger. The filename field of the struct needs to be
checked for NULL before printing it to a log to avoid
dereference of a NULL-pointer.
Upstream-Status: Inappropriate [the latest upstream version doesn't use
this code]
Signed-off-by: Dmitry Rozhkov <dmitry.rozhkov@linux.intel.com>
---
src/log.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/log.c b/src/log.c
index 5e5b030..2e3f693 100644
--- a/src/log.c
+++ b/src/log.c
@@ -412,7 +412,7 @@ static char *format_log_message(int log_type, enum log_priority priority, struct
filebuf[PATH_MAXLEN - 1] = 0;
filebuf2[0] = 0;
strncpy(filebuf, filename, PATH_MAXLEN - 1);
- if (file) {
+ if (file && file->filename) {
strncpy(filebuf2, file->filename, PATH_MAXLEN - 1);
filebuf2[PATH_MAXLEN - 1] = 0;
}
--
2.5.0
|