qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* posix/regex.c (EXTEND_BUFFER): Compute increment once. 

Move all three components of a bounded pointer.
2000-07-07  Greg McGary  <greg@mcgary.org>

	* posix/regex.c (EXTEND_BUFFER): Compute increment once.
	Move all three components of a bounded pointer.
This commit is contained in:
Greg McGary 2000-07-07 07:53:40 +00:00
parent 89a4f6ff1f
commit 8ccd2cb191
2 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2000-07-07 Greg McGary <greg@mcgary.org>
* posix/regex.c (EXTEND_BUFFER): Compute increment once.
Move all three components of a bounded pointer.
2000-07-07 Ulrich Drepper <drepper@redhat.com> 2000-07-07 Ulrich Drepper <drepper@redhat.com>
* locale/programs/locale.c (write_locales): Don't simply add all * locale/programs/locale.c (write_locales): Don't simply add all

29
posix/regex.c
View File

@ -1747,28 +1747,35 @@ static reg_errcode_t compile_range _RE_ARGS ((unsigned int range_start,
reset the pointers that pointed into the old block to point to the reset the pointers that pointed into the old block to point to the
correct places in the new one. If extending the buffer results in it correct places in the new one. If extending the buffer results in it
being larger than MAX_BUF_SIZE, then flag memory exhausted. */ being larger than MAX_BUF_SIZE, then flag memory exhausted. */
#if __BOUNDED_POINTERS__
# define MOVE_BUFFER_POINTER(P) \
(__ptrlow (P) += incr, __ptrhigh (P) += incr, __ptrvalue (P) += incr)
#else
# define MOVE_BUFFER_POINTER(P) (P) += incr
#endif
#define EXTEND_BUFFER() \ #define EXTEND_BUFFER() \
do { \ do { \
unsigned char *old_buffer = bufp->buffer; \ unsigned char *old_buffer = bufp->buffer; \
if (bufp->allocated == MAX_BUF_SIZE) \ if (bufp->allocated == MAX_BUF_SIZE) \
return REG_ESIZE; \ return REG_ESIZE; \
bufp->allocated <<= 1; \ bufp->allocated <<= 1; \
if (bufp->allocated > MAX_BUF_SIZE) \ if (bufp->allocated > MAX_BUF_SIZE) \
bufp->allocated = MAX_BUF_SIZE; \ bufp->allocated = MAX_BUF_SIZE; \
bufp->buffer = (unsigned char *) REALLOC (bufp->buffer, bufp->allocated);\ bufp->buffer = (unsigned char *) REALLOC (bufp->buffer, bufp->allocated);\
if (bufp->buffer == NULL) \ if (bufp->buffer == NULL) \
return REG_ESPACE; \ return REG_ESPACE; \
/* If the buffer moved, move all the pointers into it. */ \ /* If the buffer moved, move all the pointers into it. */ \
if (old_buffer != bufp->buffer) \ if (old_buffer != bufp->buffer) \
{ \ { \
b = (b - old_buffer) + bufp->buffer; \ int incr = bufp->buffer - old_buffer; \
begalt = (begalt - old_buffer) + bufp->buffer; \ MOVE_BUFFER_POINTER (b); \
if (fixup_alt_jump) \ MOVE_BUFFER_POINTER (begalt); \
fixup_alt_jump = (fixup_alt_jump - old_buffer) + bufp->buffer;\ if (fixup_alt_jump) \
if (laststart) \ MOVE_BUFFER_POINTER (fixup_alt_jump); \
laststart = (laststart - old_buffer) + bufp->buffer; \ if (laststart) \
if (pending_exact) \ MOVE_BUFFER_POINTER (laststart); \
pending_exact = (pending_exact - old_buffer) + bufp->buffer; \ if (pending_exact) \
MOVE_BUFFER_POINTER (pending_exact); \
} \ } \
} while (0) } while (0)