From: Matt Armstrong <matt@rfc20.org>
Date: Sun, 23 Oct 2022 15:58:00 +0000 (-0700)
Subject: Fix compiler warning about possible null pointer dereference
X-Git-Tag: emacs-29.0.90~1616^2~406^2
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9d7ba2b1998afc3664c37d9d1b6f6ca2d68356e9;p=emacs.git

Fix compiler warning about possible null pointer dereference

* src/itree.c (interval_tree_remove_fix): Use 'eassert' to both check
for non-null and suppress a compiler warning.
---

diff --git a/src/itree.c b/src/itree.c
index 501226b7e28..e824f2c8914 100644
--- a/src/itree.c
+++ b/src/itree.c
@@ -919,6 +919,7 @@ interval_tree_remove_fix (struct itree_tree *tree,
 	      interval_tree_rotate_left (tree, parent);
 	      other = parent->right;
             }
+          eassume (other != NULL);
 
           if (null_safe_is_black (other->left) /* 2.a */
               && null_safe_is_black (other->right))
@@ -956,6 +957,7 @@ interval_tree_remove_fix (struct itree_tree *tree,
 	      interval_tree_rotate_right (tree, parent);
 	      other = parent->left;
             }
+          eassume (other != NULL);
 
           if (null_safe_is_black (other->right) /* 2.b */
               && null_safe_is_black (other->left))