mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'tg/memfixes'

Browse Source 
Fixes for a handful memory access issues identified by valgrind.

* tg/memfixes:
  sub-process: use child_process.args instead of child_process.argv
  http-push: fix construction of hex value from path
  path.c: fix uninitialized memory access
This commit is contained in:
Junio C Hamano
2017-10-07 16:27:54 +09:00
parent cfa0fd0ffc 2944a94c6b
commit 98c03a0de8
3 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
path.c
View File

@ -34,11 +34,10 @@ static struct strbuf *get_pathname(void)
return sb;
}
static char *cleanup_path(char *path)
static const char *cleanup_path(const char *path)
{
/* Clean it up */
if (!memcmp(path, "./", 2)) {
path += 2;
if (skip_prefix(path, "./", &path)) {
while (*path == '/')
path++;
}
@ -47,7 +46,7 @@ static char *cleanup_path(char *path)
static void strbuf_cleanup_path(struct strbuf *sb)
{
char *path = cleanup_path(sb->buf);
const char *path = cleanup_path(sb->buf);
if (path > sb->buf)
strbuf_remove(sb, 0, path - sb->buf);
}
@ -64,7 +63,7 @@ char *mksnpath(char *buf, size_t n, const char *fmt, ...)
strlcpy(buf, bad_path, n);
return buf;
}
return cleanup_path(buf);
return (char *)cleanup_path(buf);
}
static int dir_prefix(const char *buf, const char *dir)