mirrors
/
mc
mirror of https://github.com/MidnightCommander/mc
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* screen.c (format_file): Add a new parameter (size of the 

output buffer) to prevent buffer overflow on very wide
terminals.
From Thomas Dickey <dickey@herndon4.his.com>
This commit is contained in:
Pavel Roskin 2002-02-06 05:14:16 +00:00
parent e9eac440ff
commit 9a67ad6ebf
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/ChangeLog
View File

@ -1,3 +1,10 @@
2002-02-05 Pavel Roskin <proski@gnu.org>
* screen.c (format_file): Add a new parameter (size of the
output buffer) to prevent buffer overflow on very wide
terminals.
From Thomas Dickey <dickey@herndon4.his.com>
2002-02-04 Andrew V. Samoilov <kai@cmail.ru>
* util.c [!HAVE_TRUNCATE] (truncate): Close fd if my_ftruncate

8
src/screen.c
View File

@ -497,7 +497,7 @@ file_compute_color (int attr, file_entry *fe)
/* Formats the file number file_index of panel in the buffer dest */
static void
format_file (char *dest, WPanel *panel, int file_index, int width, int attr, int isstatus)
format_file (char *dest, int limit, WPanel *panel, int file_index, int width, int attr, int isstatus)
{
int color, length, empty_line;
char *txt;
@ -534,6 +534,10 @@ format_file (char *dest, WPanel *panel, int file_index, int width, int attr, int
len = format->field_len;
if (len + length > width)
len = width - length;
if (len + (cdest - dest) > limit)
len = limit - (cdest - dest);
if (len <= 0)
break;
cdest = to_buffer (cdest, format->just_mode, len, txt);
length += len;
@ -597,7 +601,7 @@ repaint_file (WPanel *panel, int file_index, int mv, int attr, int isstatus)
widget_move (&panel->widget, file_index - panel->top_file + 2, 1);
}
format_file (buffer, panel, file_index, width, attr, isstatus);
format_file (buffer, sizeof(buffer), panel, file_index, width, attr, isstatus);
if (!isstatus && panel->split){
if (second_column)