diff options
| author | Matt Armstrong | 2022-10-23 08:58:00 -0700 |
|---|---|---|
| committer | Matt Armstrong | 2022-10-23 09:00:01 -0700 |
| commit | 9d7ba2b1998afc3664c37d9d1b6f6ca2d68356e9 (patch) | |
| tree | 9cbe71ada13440cc1600e86bcdc79d290dc4c983 | |
| parent | b78be2bf7a9ac8b71d25529d5736373f51852c36 (diff) | |
| download | emacs-feature/noverlay.tar.gz emacs-feature/noverlay.zip | |
Fix compiler warning about possible null pointer dereferencefeature/noverlay
* src/itree.c (interval_tree_remove_fix): Use 'eassert' to both check
for non-null and suppress a compiler warning.
| -rw-r--r-- | src/itree.c | 2 |
1 files changed, 2 insertions, 0 deletions
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, | |||
| 919 | interval_tree_rotate_left (tree, parent); | 919 | interval_tree_rotate_left (tree, parent); |
| 920 | other = parent->right; | 920 | other = parent->right; |
| 921 | } | 921 | } |
| 922 | eassume (other != NULL); | ||
| 922 | 923 | ||
| 923 | if (null_safe_is_black (other->left) /* 2.a */ | 924 | if (null_safe_is_black (other->left) /* 2.a */ |
| 924 | && null_safe_is_black (other->right)) | 925 | && null_safe_is_black (other->right)) |
| @@ -956,6 +957,7 @@ interval_tree_remove_fix (struct itree_tree *tree, | |||
| 956 | interval_tree_rotate_right (tree, parent); | 957 | interval_tree_rotate_right (tree, parent); |
| 957 | other = parent->left; | 958 | other = parent->left; |
| 958 | } | 959 | } |
| 960 | eassume (other != NULL); | ||
| 959 | 961 | ||
| 960 | if (null_safe_is_black (other->right) /* 2.b */ | 962 | if (null_safe_is_black (other->right) /* 2.b */ |
| 961 | && null_safe_is_black (other->left)) | 963 | && null_safe_is_black (other->left)) |