From ba9a4a4c8b16bca51af6bdb2632c1ddc09c231ea Mon Sep 17 00:00:00 2001 From: Graham Leggett Date: Sun, 8 Jul 2018 17:27:08 +0000 Subject: Remove redundant checks, trailing garbage is caught elsewhere. git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1835366 13f79535-47bb-0310-9956-ffa450edef68 --- json/apr_json_decode.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) (limited to 'json') diff --git a/json/apr_json_decode.c b/json/apr_json_decode.c index 35476a8ee..7623dde1f 100644 --- a/json/apr_json_decode.c +++ b/json/apr_json_decode.c @@ -519,18 +519,12 @@ static apr_status_t apr_json_decode_boolean(apr_json_scanner_t * self, int *retv if (self->p >= self->e) return APR_EOF; - if (self->e - self->p >= 4 && strncmp("true", self->p, 4) == 0 && - (self->p == self->e || - (!isalnum(((unsigned char *)self->p)[4]) && - ((unsigned char *)self->p)[4] != '_'))) { + if (self->e - self->p >= 4 && strncmp("true", self->p, 4) == 0) { self->p += 4; *retval = 1; return APR_SUCCESS; } - else if (self->e - self->p >= 5 && strncmp("false", self->p, 5) == 0 && - (self->p == self->e || - (!isalnum(((unsigned char *)self->p)[5]) && - ((unsigned char *)self->p)[5] != '_'))) { + else if (self->e - self->p >= 5 && strncmp("false", self->p, 5) == 0) { self->p += 5; *retval = 0; return APR_SUCCESS; @@ -678,10 +672,7 @@ out: static apr_status_t apr_json_decode_null(apr_json_scanner_t * self) { - if (self->e - self->p >= 4 && strncmp("null", self->p, 4) == 0 && - (self->p == self->e || - (!isalnum(((unsigned char *)self->p)[4]) && - ((unsigned char *)self->p)[4] != '_'))) { + if (self->e - self->p >= 4 && strncmp("null", self->p, 4) == 0) { self->p += 4; return APR_SUCCESS; } -- cgit v1.2.1