From a1189835bd14dd95c9e6d6f5736ee4b29835101c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 28 Sep 2023 11:34:30 +0100 Subject: gentoo auto-resync : 28:09:2023 - 11:34:30 --- app-misc/mc/files/mc-4.8.30-mcdiff-segfault.patch | 36 +++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 app-misc/mc/files/mc-4.8.30-mcdiff-segfault.patch (limited to 'app-misc/mc/files') diff --git a/app-misc/mc/files/mc-4.8.30-mcdiff-segfault.patch b/app-misc/mc/files/mc-4.8.30-mcdiff-segfault.patch new file mode 100644 index 000000000000..ad752a11816f --- /dev/null +++ b/app-misc/mc/files/mc-4.8.30-mcdiff-segfault.patch @@ -0,0 +1,36 @@ +From dfe3279a365d629ba848f0265108d98d9f12348f Mon Sep 17 00:00:00 2001 +From: Andrew Borodin +Date: Sun, 27 Aug 2023 19:32:53 +0300 +Subject: [PATCH] Ticket 4500: mcdiff: segfault when display of line numbers is + enabled. + +The bug was introduced in 00f84fbf24b5f65381f41c5d6333182bc7921700. + + * (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 +--- a/src/diffviewer/ydiff.c ++++ b/src/diffviewer/ydiff.c +@@ -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) -- cgit v1.2.3