cirno/plan9port
1
0
Fork 0
mirror of https://github.com/9fans/plan9port.git synced 2025-01-12 11:10:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

libregexp: various fixes

Browse source 
- Check before dereference.
- Fix memory leak
- Remove duplicate if statement.
- Remove trailing spaces.

Change-Id: I140a05c8f7006493dddae753aebfa5b4577c65ef
Reviewed-on: https://plan9port-review.googlesource.com/1301
Reviewed-by: Neven Sajko <nsajko@gmail.com>
Reviewed-by: Russ Cox <rsc@swtch.com>
This commit is contained in:
David du Colombier 2015-08-09 21:18:41 +02:00 committed by Russ Cox
parent 2d82ef9d98
commit 1b68dbef7b
3 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/libregexp/regexec.c
View file

@ -171,7 +171,7 @@ regexec2(Reprog *progp, /* program to run */
return -1; return -1;
relist1 = malloc(BIGLISTSIZE*sizeof(Relist)); relist1 = malloc(BIGLISTSIZE*sizeof(Relist));
if(relist1 == nil){ if(relist1 == nil){
free(relist1); free(relist0);
return -1; return -1;
} }
j->relist[0] = relist0; j->relist[0] = relist0;

1
src/libregexp/rregexec.c
View file

@ -40,7 +40,6 @@ rregexec1(Reprog *progp, /* program to run */
/* Execute machine once for each character, including terminal NUL */ /* Execute machine once for each character, including terminal NUL */
s = j->rstarts; s = j->rstarts;
do{ do{
/* fast check for first char */ /* fast check for first char */
if(checkstart) { if(checkstart) {
switch(j->starttype) { switch(j->starttype) {

5
src/libregexp/rregsub.c
View file

@ -27,7 +27,7 @@ rregsub(Rune *sp, /* source string */
case '8': case '8':
case '9': case '9':
i = *sp-'0'; i = *sp-'0';
if(mp[i].s.rsp != 0 && mp!=0 && ms>i) if(mp!=0 && mp[i].s.rsp != 0 && ms>i)
for(ssp = mp[i].s.rsp; for(ssp = mp[i].s.rsp;
ssp < mp[i].e.rep; ssp < mp[i].e.rep;
ssp++) ssp++)
@ -47,8 +47,7 @@ rregsub(Rune *sp, /* source string */
break; break;
} }
}else if(*sp == '&'){ }else if(*sp == '&'){
if(mp[0].s.rsp != 0 && mp!=0 && ms>0) if(mp!=0 && mp[0].s.rsp != 0 && ms>0)
if(mp[0].s.rsp != 0)
for(ssp = mp[0].s.rsp; for(ssp = mp[0].s.rsp;
ssp < mp[0].e.rep; ssp++) ssp < mp[0].e.rep; ssp++)
if(dp < ep) if(dp < ep)