mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2025-01-08 20:41:59 +03:00
Code Issues Packages Projects Releases Wiki Activity

Ticket 4500: mcdiff: segfault when display of line numbers is enabled.

Browse Source 
The bug was introduced in 00f84fbf24.

  * (dview_load_options): avoid NULL dereference: don't caclulate the
    width of line numbers field here because dview->a isn't created yet.
  * (dview_update): caclulate the width of line numbers field using an
    actual length of diff lines array.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
This commit is contained in:
Andrew Borodin 2023-08-27 19:32:53 +03:00
parent 2849d5080e
commit dfe3279a36
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/diffviewer/ydiff.c
View File

@ -2366,7 +2366,7 @@ dview_load_options (WDiff * dview)
dview->display_symbols = 1;
show_numbers = mc_config_get_bool (mc_global.main_config, "DiffView", "show_numbers", FALSE);
if (show_numbers)
dview->display_numbers = calc_nwidth ((const GArray * const *) dview->a);
dview->display_numbers = 1;
tab_size = mc_config_get_int (mc_global.main_config, "DiffView", "tab_size", 8);
if (tab_size > 0 && tab_size < 9)
dview->tab_size = tab_size;
@ -2885,6 +2885,10 @@ dview_update (WDiff * dview)
if (height < 2)
return;
/* use an actual length of dview->a */
if (dview->display_numbers != 0)
dview->display_numbers = calc_nwidth ((const GArray * const *) dview->a);
width1 = dview->half1 + dview->bias;
width2 = dview->half2 - dview->bias;
if (dview->full)