From 1b68dbef7b7dd7c4aa2b5755c1399cf66d2ea6fa Mon Sep 17 00:00:00 2001 From: David du Colombier <0intro@gmail.com> Date: Sun, 9 Aug 2015 21:18:41 +0200 Subject: libregexp: various fixes - 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 Reviewed-by: Russ Cox --- src/libregexp/rregsub.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/libregexp/rregsub.c') diff --git a/src/libregexp/rregsub.c b/src/libregexp/rregsub.c index 5a4a564d..8b3e9738 100644 --- a/src/libregexp/rregsub.c +++ b/src/libregexp/rregsub.c @@ -27,7 +27,7 @@ rregsub(Rune *sp, /* source string */ case '8': case '9': 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; ssp < mp[i].e.rep; ssp++) @@ -46,9 +46,8 @@ rregsub(Rune *sp, /* source string */ *dp++ = *sp; break; } - }else if(*sp == '&'){ - if(mp[0].s.rsp != 0 && mp!=0 && ms>0) - if(mp[0].s.rsp != 0) + }else if(*sp == '&'){ + if(mp!=0 && mp[0].s.rsp != 0 && ms>0) for(ssp = mp[0].s.rsp; ssp < mp[0].e.rep; ssp++) if(dp < ep) -- cgit v1.2.3