From b2841c0db6aa4bbffafe7848b9f356be0f48eaee Mon Sep 17 00:00:00 2001 From: ChunEon Park Date: Tue, 27 May 2014 22:00:59 +0900 Subject: [PATCH] edje/edje_cc - intensive null check. --- src/bin/edje/edje_cc_parse.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/bin/edje/edje_cc_parse.c b/src/bin/edje/edje_cc_parse.c index af45a18657..b0b5ba4e8d 100644 --- a/src/bin/edje/edje_cc_parse.c +++ b/src/bin/edje/edje_cc_parse.c @@ -435,6 +435,8 @@ next_token(char *p, char *end, char **new_p, int *delim) *new_p = p; tok = mem_alloc(tok_end - tok_start + 2); + if (!tok) return NULL; + strncpy(tok, tok_start, tok_end - tok_start + 1); tok[tok_end - tok_start + 1] = 0; @@ -475,7 +477,7 @@ next_token(char *p, char *end, char **new_p, int *delim) } } } - else if ((tok) && (*tok == '(')) + else if (*tok == '(') { char *tmp; tmp = tok;