diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-08-09 22:47:25 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-08-09 22:47:25 -0700 |
| commit | 2c71810b90d122abdcc57fc3cb62174d16e77b58 (patch) | |
| tree | 79225a991410e83220007dcc04389cf0ecbfe304 /builtin-apply.c | |
| parent | 943d5b73e2adf3cd0d3f72c9a06c75681a4ea3ca (diff) | |
| download | git-2c71810b90d122abdcc57fc3cb62174d16e77b58.tar.gz git-2c71810b90d122abdcc57fc3cb62174d16e77b58.tar.xz | |
git-apply: applying a patch to make a symlink shorter.
The internal representation of the result is counted string
(i.e. char *buf and ulong size), which is fine for writing out
to regular file, but throwing the buf at symlink(2) was a
no-no.
Reported by Willy Tarreau.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'builtin-apply.c')
| -rw-r--r-- | builtin-apply.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/builtin-apply.c b/builtin-apply.c index f8c6763c7..c15987386 100644 --- a/builtin-apply.c +++ b/builtin-apply.c @@ -1698,6 +1698,14 @@ static int apply_data(struct patch *patch, struct stat *st, struct cache_entry * desc.buffer = buf; if (apply_fragments(&desc, patch) < 0) return -1; + + /* NUL terminate the result */ + if (desc.alloc <= desc.size) { + desc.buffer = xrealloc(desc.buffer, desc.size + 1); + desc.alloc++; + } + desc.buffer[desc.size] = 0; + patch->result = desc.buffer; patch->resultsize = desc.size; @@ -2040,6 +2048,9 @@ static int try_create_file(const char *path, unsigned int mode, const char *buf, int fd; if (S_ISLNK(mode)) + /* Although buf:size is counted string, it also is NUL + * terminated. + */ return symlink(buf, path); fd = open(path, O_CREAT | O_EXCL | O_WRONLY, (mode & 0100) ? 0777 : 0666); if (fd < 0) |