diff options
| author |  Dmitry Potapov <dpotapov@gmail.com> | 2008-07-16 18:54:02 +0400 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2008-07-16 14:03:24 -0700 |
| commit | fd55a19eb1d49ae54008d932a65f79cd6fda45c9 (patch) | |
| tree | 924e7874961e54d268e36a1e71b6b88414dc421b /diff.h | |
| parent | Fix buffer overflow in git-grep (diff) | |
| download | tgif-fd55a19eb1d49ae54008d932a65f79cd6fda45c9.tar.xz | |
Fix buffer overflow in git diff
If PATH_MAX on your system is smaller than a path stored, it may cause
buffer overflow and stack corruption in diff_addremove() and diff_change()
functions when running git-diff
Signed-off-by: Dmitry Potapov <dpotapov@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'diff.h')
| -rw-r--r-- | diff.h | 9 |
1 files changed, 4 insertions, 5 deletions
@@ -14,12 +14,12 @@ typedef void (*change_fn_t)(struct diff_options *options, unsigned old_mode, unsigned new_mode, const unsigned char *old_sha1, const unsigned char *new_sha1, - const char *base, const char *path); + const char *fullpath); typedef void (*add_remove_fn_t)(struct diff_options *options, int addremove, unsigned mode, const unsigned char *sha1, - const char *base, const char *path); + const char *fullpath); typedef void (*diff_format_fn_t)(struct diff_queue_struct *q, struct diff_options *options, void *data); @@ -164,14 +164,13 @@ extern void diff_addremove(struct diff_options *, int addremove, unsigned mode, const unsigned char *sha1, - const char *base, - const char *path); + const char *fullpath); extern void diff_change(struct diff_options *, unsigned mode1, unsigned mode2, const unsigned char *sha1, const unsigned char *sha2, - const char *base, const char *path); + const char *fullpath); extern void diff_unmerge(struct diff_options *, const char *path, |