diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-07-11 13:03:16 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-07-11 13:03:16 -0700 |
| commit | fb58544ec738ecdede58ad9dadb2d4676c544eb9 (patch) | |
| tree | 9714eeb4bbab28387b189ccb108dd1118551b726 | |
| parent | Merge branch 'maint' (diff) | |
| parent | lockfile: fix buffer overflow in path handling (diff) | |
| download | tgif-fb58544ec738ecdede58ad9dadb2d4676c544eb9.tar.xz | |
Merge branch 'mh/maint-lockfile-overflow'
* mh/maint-lockfile-overflow:
lockfile: fix buffer overflow in path handling
| -rw-r--r-- | lockfile.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/lockfile.c b/lockfile.c index c6fb77b26f..8fbcb6a98a 100644 --- a/lockfile.c +++ b/lockfile.c @@ -124,15 +124,17 @@ static char *resolve_symlink(char *p, size_t s) static int lock_file(struct lock_file *lk, const char *path, int flags) { - if (strlen(path) >= sizeof(lk->filename)) - return -1; - strcpy(lk->filename, path); /* * subtract 5 from size to make sure there's room for adding * ".lock" for the lock file name */ + static const size_t max_path_len = sizeof(lk->filename) - 5; + + if (strlen(path) >= max_path_len) + return -1; + strcpy(lk->filename, path); if (!(flags & LOCK_NODEREF)) - resolve_symlink(lk->filename, sizeof(lk->filename)-5); + resolve_symlink(lk->filename, max_path_len); strcat(lk->filename, ".lock"); lk->fd = open(lk->filename, O_RDWR | O_CREAT | O_EXCL, 0666); if (0 <= lk->fd) { |