[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 438975b 1/6: regex-emacs omit POS runtime check
From: |
Paul Eggert |
Subject: |
master 438975b 1/6: regex-emacs omit POS runtime check |
Date: |
Wed, 26 Aug 2020 03:20:38 -0400 (EDT) |
branch: master
commit 438975bbaa25b7de74993e7928c45cf5779442b8
Author: Paul Eggert <eggert@cs.ucla.edu>
Commit: Paul Eggert <eggert@cs.ucla.edu>
regex-emacs omit POS runtime check
* src/regex-emacs.c (re_match_2_internal): Replace unnecessary
runtime check of POS with some eassumes.
---
src/regex-emacs.c | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/src/regex-emacs.c b/src/regex-emacs.c
index c44cce9..954a193 100644
--- a/src/regex-emacs.c
+++ b/src/regex-emacs.c
@@ -3864,6 +3864,10 @@ re_match_2_internal (struct re_pattern_buffer *bufp,
re_char *string2, ptrdiff_t size2,
ptrdiff_t pos, struct re_registers *regs, ptrdiff_t stop)
{
+ eassume (0 <= size1);
+ eassume (0 <= size2);
+ eassume (0 <= pos && pos <= stop && stop <= size1 + size2);
+
/* General temporaries. */
int mcnt;
@@ -3979,14 +3983,6 @@ re_match_2_internal (struct re_pattern_buffer *bufp,
best_regend = best_regstart + num_regs;
}
- /* The starting position is bogus. */
- if (pos < 0 || pos > size1 + size2)
- {
- unbind_to (count, Qnil);
- SAFE_FREE ();
- return -1;
- }
-
/* Initialize subexpression text positions to -1 to mark ones that no
start_memory/stop_memory has been seen for. */
for (ptrdiff_t reg = 1; reg < num_regs; reg++)
- master updated (b64d04c -> e823709), Paul Eggert, 2020/08/26
- master 438975b 1/6: regex-emacs omit POS runtime check,
Paul Eggert <=
- master 768bea3 2/6: regex-emacs omit allocation of 3 slots, Paul Eggert, 2020/08/26
- master 82c089f 3/6: regex-emacs: omit regstart tests and regend set, Paul Eggert, 2020/08/26
- master 4c0a975 4/6: regex-emacs: subscript-check register numbers, Paul Eggert, 2020/08/26
- master bd5771f 5/6: regex-emacs: fix leak on memory allocation failure, Paul Eggert, 2020/08/26
- master e823709 6/6: regex-emacs: copy less when reallocating, Paul Eggert, 2020/08/26