Merge pull request #334 from MonokelPinguin/master

fix segfault when doesn't have a trailing '/'
master
Drew DeVault 9 years ago
commit 916ab81c02

@ -12,7 +12,7 @@
#include "log.h" #include "log.h"
static int create_pool_file(size_t size, char **name) { static int create_pool_file(size_t size, char **name) {
static const char template[] = "/sway-client-XXXXXX"; static const char template[] = "sway-client-XXXXXX";
const char *path = getenv("XDG_RUNTIME_DIR"); const char *path = getenv("XDG_RUNTIME_DIR");
if (!path) { if (!path) {
return -1; return -1;
@ -23,7 +23,7 @@ static int create_pool_file(size_t size, char **name) {
*name = malloc( *name = malloc(
strlen(template) + strlen(template) +
strlen(path) + strlen(path) +
(ts ? 1 : 0) + 1); (ts ? 0 : 1) + 1);
sprintf(*name, "%s%s%s", path, ts ? "" : "/", template); sprintf(*name, "%s%s%s", path, ts ? "" : "/", template);
int fd = mkstemp(*name); int fd = mkstemp(*name);

Loading…
Cancel
Save