diff options
author | Brian Ashworth <RedSoxFan@users.noreply.github.com> | 2018-08-08 15:26:44 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-08 15:26:44 -0400 |
commit | 3c26536267e13859eb6088ce0192579f10ac871f (patch) | |
tree | a4676629358071b0f0748dde33a32d82c9a58175 /common/ipc-client.c | |
parent | Fix segv when sway is terminating (diff) | |
parent | 私の日本語が上手じゃないですね (diff) | |
download | sway-3c26536267e13859eb6088ce0192579f10ac871f.tar.gz sway-3c26536267e13859eb6088ce0192579f10ac871f.tar.zst sway-3c26536267e13859eb6088ce0192579f10ac871f.zip |
Merge branch 'master' into master
Diffstat (limited to 'common/ipc-client.c')
-rw-r--r-- | common/ipc-client.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/common/ipc-client.c b/common/ipc-client.c index 4d2d88cc..24a2f9c2 100644 --- a/common/ipc-client.c +++ b/common/ipc-client.c | |||
@@ -25,6 +25,7 @@ char *get_socketpath(void) { | |||
25 | if (line && *line) { | 25 | if (line && *line) { |
26 | return line; | 26 | return line; |
27 | } | 27 | } |
28 | free(line); | ||
28 | } | 29 | } |
29 | const char *i3sock = getenv("I3SOCK"); | 30 | const char *i3sock = getenv("I3SOCK"); |
30 | if (i3sock) { | 31 | if (i3sock) { |
@@ -37,6 +38,7 @@ char *get_socketpath(void) { | |||
37 | if (line && *line) { | 38 | if (line && *line) { |
38 | return line; | 39 | return line; |
39 | } | 40 | } |
41 | free(line); | ||
40 | } | 42 | } |
41 | return NULL; | 43 | return NULL; |
42 | } | 44 | } |