diff options
author | sin <sin@2f30.org> | 2016-01-06 15:53:04 +0000 |
---|---|---|
committer | sin <sin@2f30.org> | 2016-01-06 15:53:04 +0000 |
commit | fa6b45a96de53621d4e89bd63ee810210712f043 (patch) | |
tree | 60775d70d62c4ed7123cc90922a83ae517511fa1 /noice.c | |
parent | e27af6f1dbc804e90a3b98f19afdf1055bab8dc9 (diff) | |
download | noice-fa6b45a96de53621d4e89bd63ee810210712f043.tar.gz |
Avoid unneeded memory allocation in xdirname()
Diffstat (limited to 'noice.c')
-rw-r--r-- | noice.c | 12 |
1 files changed, 4 insertions, 8 deletions
@@ -158,21 +158,17 @@ xstrdup(const char *s) char * xdirname(const char *path) { - char *p, *tmp; + char tmp[PATH_MAX], *p; /* Some implementations of dirname(3) may modify `path' and some * return a pointer inside `path' and we cannot free(3) the * original string if we lose track of it. */ - tmp = xstrdup(path); + strlcpy(tmp, path, sizeof(tmp)); p = dirname(tmp); - if (p == NULL) { - free(tmp); + if (p == NULL) printerr(1, "dirname"); - } /* Make sure this is a malloc(3)-ed string */ - p = xstrdup(p); - free(tmp); - return p; + return xstrdup(p); } void |