]> git.eshelyaron.com Git - emacs.git/commitdiff
Pacify GCC 14 -Wnull-dereference in intervals.c
authorPaul Eggert <eggert@cs.ucla.edu>
Tue, 30 Apr 2024 08:20:12 +0000 (01:20 -0700)
committerEshel Yaron <me@eshelyaron.com>
Mon, 6 May 2024 16:29:36 +0000 (18:29 +0200)
* src/intervals.c (set_intervals_multibyte_1):
Add an eassume to pacify GCC.  Deparenthesisze.

(cherry picked from commit 750dbccc12415fe525111cd11811d809fc830610)

src/intervals.c

index 2ab19c2cc564e46f776c8957d247606a95e19f79..c7a1f81e4ee86d5f7cd38aaf3ffb755ab3203ee1 100644 (file)
@@ -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);
        }
     }
 }