com php-src: Fixed null pointer dereference: ext/standard/url _scanner_ex.c ext/standard/url_scanner_ex.re

From: Date: Sun, 30 Mar 2014 09:53:17 +0000
Subject: com php-src: Fixed null pointer dereference: ext/standard/url _scanner_ex.c ext/standard/url_scanner_ex.re
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-77520@lists.php.net to get a copy of this message
Commit: 35199a3d0c7a394bb99413b46d5e5942ab100447 Author: Xinchen Hui <laruence@gmail.com> Sun, 30 Mar 2014 17:53:17 +0800 Parents: 6c16325034b8131529c3d71b3b0edd812a2e0ed8 Branches: phpng Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=35199a3d0c7a394bb99413b46d5e5942ab100447 Log: Fixed null pointer dereference Changed paths: M ext/standard/url_scanner_ex.c M ext/standard/url_scanner_ex.re Diff: diff --git a/ext/standard/url_scanner_ex.c b/ext/standard/url_scanner_ex.c index b1bb0a1..23b1f3f 100644 --- a/ext/standard/url_scanner_ex.c +++ b/ext/standard/url_scanner_ex.c @@ -282,7 +282,7 @@ static void handle_form(STD_PARA) if (!strncasecmp(ctx->tag.s->val, "form", sizeof("form") - 1)) { doit = 1; } - if (doit && ctx->val.s->val && ctx->lookup_data && *ctx->lookup_data) { + if (doit && ctx->val.s && ctx->lookup_data && *ctx->lookup_data) { char *e, *p = (char *)zend_memnstr(ctx->val.s->val, "://", sizeof("://") - 1, ctx->val.s->val + ctx->val.s->len); if (p) { e = memchr(p, '/', (ctx->val.s->val + ctx->val.s->len) - p); diff --git a/ext/standard/url_scanner_ex.re b/ext/standard/url_scanner_ex.re index cc9bdbc..38ed063 100644 --- a/ext/standard/url_scanner_ex.re +++ b/ext/standard/url_scanner_ex.re @@ -218,7 +218,7 @@ static void handle_form(STD_PARA) if (!strncasecmp(ctx->tag.s->val, "form", sizeof("form") - 1)) { doit = 1; } - if (doit && ctx->val.s->val && ctx->lookup_data && *ctx->lookup_data) { + if (doit && ctx->val.s && ctx->lookup_data && *ctx->lookup_data) { char *e, *p = (char *)zend_memnstr(ctx->val.s->val, "://", sizeof("://") - 1, ctx->val.s->val + ctx->val.s->len); if (p) { e = memchr(p, '/', (ctx->val..s->val + ctx->val.s->len) - p);

« previous php.cvs (#77520) next »