From 355d211a002791f653ec8b16525430070b2cee12 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Tue, 30 Apr 2024 01:20:12 -0700 Subject: [PATCH] Pacify GCC 14 -Wnull-dereference in intervals.c * src/intervals.c (set_intervals_multibyte_1): Add an eassume to pacify GCC. Deparenthesisze. (cherry picked from commit 750dbccc12415fe525111cd11811d809fc830610) --- src/intervals.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/intervals.c b/src/intervals.c index 2ab19c2cc56..c7a1f81e4ee 100644 --- a/src/intervals.c +++ b/src/intervals.c @@ -2388,17 +2388,18 @@ set_intervals_multibyte_1 (INTERVAL i, bool multi_flag, to this interval. */ if (LEFT_TOTAL_LENGTH (i) + RIGHT_TOTAL_LENGTH (i) >= TOTAL_LENGTH (i)) { - if ((i)->left) + if (i->left) { set_interval_plist (i, i->left->plist); - (i)->left->total_length = 0; + i->left->total_length = 0; delete_interval ((i)->left); } else { + eassume (i->right); set_interval_plist (i, i->right->plist); - (i)->right->total_length = 0; - delete_interval ((i)->right); + i->right->total_length = 0; + delete_interval (i->right); } } } -- 2.39.5