From: Paul Eggert <eggert@cs.ucla.edu>
Date: Tue, 30 Apr 2024 08:20:12 +0000 (-0700)
Subject: Pacify GCC 14 -Wnull-dereference in intervals.c
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=355d211a002791f653ec8b16525430070b2cee12;p=emacs.git

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)
---

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);
 	}
     }
 }