d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

regcomp: revert part of r341838 which turned out to be unrelated

Browse Source 
and caused issues with search in less.

PR:		234066
Reviewed by:	pfg
Differential revision:	https://reviews.freebsd.org/D18611
This commit is contained in:
Yuri Pankov 2018-12-19 23:28:56 +00:00
parent 3e0178fb94
commit e2a87ae3af
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=342265
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/libc/regex/regcomp.c
View File

@ -1841,29 +1841,21 @@ computejumps(struct parse *p, struct re_guts *g)
{
int ch;
int mindex;
int cmin, cmax;
/*
* For UTF-8 we process only the first 128 characters corresponding to
* the POSIX locale.
*/
cmin = MB_CUR_MAX == 1 ? CHAR_MIN : 0;
cmax = MB_CUR_MAX == 1 ? CHAR_MAX : 127;
/* Avoid making errors worse */
if (p->error != 0)
return;
g->charjump = (int *)malloc((cmax - cmin + 1) * sizeof(int));
g->charjump = (int *)malloc((NC_MAX + 1) * sizeof(int));
if (g->charjump == NULL) /* Not a fatal error */
return;
/* Adjust for signed chars, if necessary */
g->charjump = &g->charjump[-(cmin)];
g->charjump = &g->charjump[-(CHAR_MIN)];
/* If the character does not exist in the pattern, the jump
* is equal to the number of characters in the pattern.
*/
for (ch = cmin; ch < cmax + 1; ch++)
for (ch = CHAR_MIN; ch < (CHAR_MAX + 1); ch++)
g->charjump[ch] = g->mlen;
/* If the character does exist, compute the jump that would