global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-02-19 14:21:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'jm/maint-strncpy-diff-no-index' into next

Browse Source 
Will merge to 'next'.

By Jim Meyering
* jm/maint-strncpy-diff-no-index:
  diff: avoid stack-buffer-read-overrun for very long name
This commit is contained in:
Junio C Hamano
2012-04-20 16:19:37 -07:00
parent 1ed9682b6d 48e510b6a2
commit 638ed9fe88
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
diff-no-index.c
View File

@@ -109,6 +109,7 @@ static int queue_diff(struct diff_options *o,
n1 = buffer1;
strncpy(buffer1 + len1, p1.items[i1++].string,
PATH_MAX - len1);
buffer1[PATH_MAX-1] = 0;
}
if (comp < 0)
@@ -117,6 +118,7 @@ static int queue_diff(struct diff_options *o,
n2 = buffer2;
strncpy(buffer2 + len2, p2.items[i2++].string,
PATH_MAX - len2);
buffer2[PATH_MAX-1] = 0;
}
ret = queue_diff(o, n1, n2);