Skip to content
Browse files

path.c: Don't discard the return value of vsnpath()

The git_snpath() and git_pathdup() functions both use the (static)
function vsnpath() in their implementation. Also, they both discard
the return value of vsnpath(), which has the effect of ignoring the
side effect of calling cleanup_path() in the non-error return path.

In order to ensure that the required cleanup happens, we use the
pointer returned by vsnpath(), rather than the buffer passed into
vsnpath(), to derive the return value from git_snpath() and

Signed-off-by: Ramsay Jones <>
Signed-off-by: Junio C Hamano <>
  • Loading branch information...
1 parent 5b3b8fa commit 66a51a9aaec3f53250b1d515a1bd81044ebb354b Ramsay Jones committed with gitster Sep 4, 2012
Showing with 6 additions and 5 deletions.
  1. +6 −5 path.c
11 path.c
@@ -70,21 +70,22 @@ static char *vsnpath(char *buf, size_t n, const char *fmt, va_list args)
char *git_snpath(char *buf, size_t n, const char *fmt, ...)
+ char *ret;
va_list args;
va_start(args, fmt);
- (void)vsnpath(buf, n, fmt, args);
+ ret = vsnpath(buf, n, fmt, args);
- return buf;
+ return ret;
char *git_pathdup(const char *fmt, ...)
- char path[PATH_MAX];
+ char path[PATH_MAX], *ret;
va_list args;
va_start(args, fmt);
- (void)vsnpath(path, sizeof(path), fmt, args);
+ ret = vsnpath(path, sizeof(path), fmt, args);
- return xstrdup(path);
+ return xstrdup(ret);
char *mkpathdup(const char *fmt, ...)

0 comments on commit 66a51a9

Please sign in to comment.
Something went wrong with that request. Please try again.