Skip to content

Commit 8d6e103

Browse files
jonasJunio C Hamano
authored andcommitted
Fix filename scaling for binary files
Set maximum filename length for binary files so that scaling won't be triggered and result in invalid string access. Signed-off-by: Jonas Fonseca <fonseca@diku.dk> Signed-off-by: Junio C Hamano <junkio@cox.net>
1 parent 4baff50 commit 8d6e103

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

diff.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -250,13 +250,14 @@ static void show_stats(struct diffstat_t* data)
250250
for (i = 0; i < data->nr; i++) {
251251
struct diffstat_file *file = data->files[i];
252252

253+
len = strlen(file->name);
254+
if (max_len < len)
255+
max_len = len;
256+
253257
if (file->is_binary || file->is_unmerged)
254258
continue;
255259
if (max_change < file->added + file->deleted)
256260
max_change = file->added + file->deleted;
257-
len = strlen(file->name);
258-
if (max_len < len)
259-
max_len = len;
260261
}
261262

262263
for (i = 0; i < data->nr; i++) {

0 commit comments

Comments
 (0)