Merge pull request #995 from SirCmpwn/memory-use

Handle allocation failures

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;