[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 750dbccc124 08/11: Pacify GCC 14 -Wnull-dereference in intervals.
From: |
Paul Eggert |
Subject: |
master 750dbccc124 08/11: Pacify GCC 14 -Wnull-dereference in intervals.c |
Date: |
Tue, 30 Apr 2024 04:26:38 -0400 (EDT) |
branch: master
commit 750dbccc12415fe525111cd11811d809fc830610
Author: Paul Eggert <eggert@cs.ucla.edu>
Commit: Paul Eggert <eggert@cs.ucla.edu>
Pacify GCC 14 -Wnull-dereference in intervals.c
* src/intervals.c (set_intervals_multibyte_1):
Add an eassume to pacify GCC. Deparenthesisze.
---
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);
}
}
}
- master updated (d24981d27ce -> aad80e1934f), Paul Eggert, 2024/04/30
- master 7e2309c6fc6 02/11: etags: fix #line parsing (\\", long lines), Paul Eggert, 2024/04/30
- master de59c02c685 01/11: Simplify etags.c by omitting a macro, Paul Eggert, 2024/04/30
- master ca4f0705be5 03/11: etags: work around GCC bug 114882, Paul Eggert, 2024/04/30
- master 62c2afe8410 05/11: Pacify GCC 14 -Wnull-dereference, Paul Eggert, 2024/04/30
- master 98d0fc989a0 04/11: Pacify GCC 14 -Walloc-size, Paul Eggert, 2024/04/30
- master c2b2a38f70f 07/11: Pacify GCC 14 -Wnull-dereference in tim_sort, Paul Eggert, 2024/04/30
- master aad80e1934f 11/11: Work around bad GCC diagnostic in select_window, Paul Eggert, 2024/04/30
- master 750dbccc124 08/11: Pacify GCC 14 -Wnull-dereference in intervals.c,
Paul Eggert <=
- master c57a03c75e9 10/11: Pacify GCC 14 -Wanalyzer-out-of-bounds in hbfont.c, Paul Eggert, 2024/04/30
- master 59a11116e01 09/11: Pacify GCC 14 -Wstring-operflow in ftfont.c, Paul Eggert, 2024/04/30
- master 009a6ba71ea 06/11: Pacify GCC 14 -Wclobbered in eval.c, Paul Eggert, 2024/04/30