diff options
| author | Mattias Engdegård | 2022-03-17 15:08:24 +0100 |
|---|---|---|
| committer | Mattias Engdegård | 2022-03-17 15:08:24 +0100 |
| commit | 43a339fe10df3952a5f1749403d7b8148554008a (patch) | |
| tree | 932cab8728739783c5b6c26cb632ffb116939b56 | |
| parent | 63c1f0d58d846095eac1bde726e0c72856a9deec (diff) | |
| download | emacs-43a339fe10df3952a5f1749403d7b8148554008a.tar.gz emacs-43a339fe10df3952a5f1749403d7b8148554008a.zip | |
Fix over-zealous assertions
* src/sort.c (gallop_left, gallop_right): Don't test Lisp values for
being nonzero; it only made sense when `key` was a pointer that had to
be non-null.
| -rw-r--r-- | src/sort.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/sort.c b/src/sort.c index 24469ef99dc..3f7a2909ad7 100644 --- a/src/sort.c +++ b/src/sort.c | |||
| @@ -223,7 +223,7 @@ gallop_left (merge_state *ms, const Lisp_Object key, Lisp_Object *a, | |||
| 223 | { | 223 | { |
| 224 | Lisp_Object pred = ms->predicate; | 224 | Lisp_Object pred = ms->predicate; |
| 225 | 225 | ||
| 226 | eassume (key && a && n > 0 && hint >= 0 && hint < n); | 226 | eassume (a && n > 0 && hint >= 0 && hint < n); |
| 227 | 227 | ||
| 228 | a += hint; | 228 | a += hint; |
| 229 | ptrdiff_t lastofs = 0; | 229 | ptrdiff_t lastofs = 0; |
| @@ -306,7 +306,7 @@ gallop_right (merge_state *ms, const Lisp_Object key, Lisp_Object *a, | |||
| 306 | { | 306 | { |
| 307 | Lisp_Object pred = ms->predicate; | 307 | Lisp_Object pred = ms->predicate; |
| 308 | 308 | ||
| 309 | eassume (key && a && n > 0 && hint >= 0 && hint < n); | 309 | eassume (a && n > 0 && hint >= 0 && hint < n); |
| 310 | 310 | ||
| 311 | a += hint; | 311 | a += hint; |
| 312 | ptrdiff_t lastofs = 0; | 312 | ptrdiff_t lastofs = 0; |