[EGIT] [core/efl] master 14/24: evil: avoid SIGSEV while using strlen function

[Yeshwanth Reddivari]

cedric pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=a605bd8498ead542405941c1f722b3b4080ad6ed

commit a605bd8498ead542405941c1f722b3b4080ad6ed
Author: Yeshwanth Reddivari <r.yeshwa...@samsung.com>
Date:   Mon Nov 9 16:10:59 2015 -0800

    evil: avoid SIGSEV while using strlen function
    
    Summary: Assertion of (fp!=NULL) should be done before passing fp to strlen 
funcion
    
    Reviewers: singh.amitesh, Hermet, alok25, mvsovani, vtorri
    
    Subscribers: sachin.dev, cedric
    
    Differential Revision: https://phab.enlightenment.org/D3274
    
    Signed-off-by: Cedric BAIL <ced...@osg.samsung.com>
---
 src/lib/evil/regex/regcomp.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/lib/evil/regex/regcomp.c b/src/lib/evil/regex/regcomp.c
index 080d292..c1b7850 100644
--- a/src/lib/evil/regex/regcomp.c
+++ b/src/lib/evil/regex/regcomp.c
@@ -1179,9 +1179,10 @@ register cset *cs;
 register char *cp;
 {
         register char *fp = mcfind(cs, cp);
-        register size_t len = strlen(fp);
+        register size_t len;
 
         assert(fp != NULL);
+        len = strlen(fp);
         (void) memmove(fp, fp + len + 1,
                                 cs->smultis - (fp + len + 1 - cs->multis));
         cs->smultis -= len;

--