summaryrefslogtreecommitdiff
path: root/common/log.c
diff options
context:
space:
mode:
authorDrew DeVault <[email protected]>2016-12-15 17:05:12 -0500
committerDrew DeVault <[email protected]>2016-12-15 19:01:40 -0500
commit9ad1e6b40f9589a5ab8242dd3b2e514b70d97799 (patch)
tree2e80e1258f5e1af0465a7dfd9959397f7009e6df /common/log.c
parent6c0fc2093641868df28c4087902a040f7fae05d4 (diff)
Handle malloc failure in ipc_recv_response
Diffstat (limited to 'common/log.c')
-rw-r--r--common/log.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/common/log.c b/common/log.c
index 4f0baa3f..825b176b 100644
--- a/common/log.c
+++ b/common/log.c
@@ -88,9 +88,14 @@ void _sway_log(const char *filename, int line, log_importance_t verbosity, const
}
if (filename && line) {
- char *file = strdup(filename);
- fprintf(stderr, "[%s:%d] ", basename(file), line);
- free(file);
+ const char *file = filename + strlen(filename);
+ while (file != filename && *file != '/') {
+ --file;
+ }
+ if (*file == '/') {
+ ++file;
+ }
+ fprintf(stderr, "[%s:%d] ", file, line);
}
va_list args;