In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/add424dabf9dadd0817fac9b1bf4c5d4e8bbd196?hp=da1ec2b1b9abdfd956d9c539abf39d908d046304>
- Log ----------------------------------------------------------------- commit add424dabf9dadd0817fac9b1bf4c5d4e8bbd196 Author: David Mitchell <[email protected]> Date: Mon Feb 6 09:20:04 2017 +0000 Perl_fbm_instr(): remove dead code. For the case where littlestr hasn't been FBM compiled (!SvVALID()), it can't be SvTAIL(), so there's no need for optional \n handling. Spotted by Coverity. ----------------------------------------------------------------------- Summary of changes: util.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/util.c b/util.c index 53b410971a..efe4c02b63 100644 --- a/util.c +++ b/util.c @@ -951,16 +951,7 @@ Perl_fbm_instr(pTHX_ unsigned char *big, unsigned char *bigend, SV *littlestr, U char * const b = ninstr((char*)big,(char*)bigend, (char*)little, (char*)little + littlelen); - if (!b && tail) { /* Automatically multiline! */ - /* Chop \n from littlestr: */ - s = bigend - littlelen + 1; - if (*s == *little - && memEQ((char*)s + 1, (char*)little + 1, littlelen - 2)) - { - return (char*)s; - } - return NULL; - } + assert(!tail); /* valid => FBM; tail only set on SvVALID SVs */ return b; } -- Perl5 Master Repository
