cvs: php-src(PHP_4_3) /ext/standard url.c

From: Date: Thu, 26 May 2005 03:56:45 +0000
Subject: cvs: php-src(PHP_4_3) /ext/standard url.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-32011@lists.php.net to get a copy of this message
iliaa Wed May 25 23:56:45 2005 EDT Modified files: (Branch: PHP_4_3) /php-src/ext/standard url.c Log: MFH: Added scheme validation for parse_url(). http://cvs.php.net/diff.php/php-src/ext/standard/url.c?r1=1.58.2.20&r2=1.58.2.21&ty=u Index: php-src/ext/standard/url.c diff -u php-src/ext/standard/url.c:1.58.2.20 php-src/ext/standard/url.c:1.58.2.21 --- php-src/ext/standard/url.c:1.58.2.20 Mon Apr 25 19:49:27 2005 +++ php-src/ext/standard/url.c Wed May 25 23:56:45 2005 @@ -15,7 +15,7 @@ | Author: Jim Winstead <jimw@php.net> | +----------------------------------------------------------------------+ */ -/* $Id: url.c,v 1.58.2.20 2005/04/25 23:49:27 iliaa Exp $ */ +/* $Id: url.c,v 1.58.2.21 2005/05/26 03:56:45 iliaa Exp $ */ #include <stdlib.h> #include <string.h> @@ -104,6 +104,19 @@ /* parse scheme */ if ((e = memchr(s, ':', length)) && (e - s)) { + /* validate scheme */ + p = s; + while (p < e) { + if (!isalnum(*p)) { + if (e + 1 < ue) { + goto parse_port; + } else { + goto just_path; + } + } + p++; + } + if (*(e + 1) == '\0') { /* only scheme is available */ ret->scheme = estrndup(s, (e - s)); php_replace_controlchars_ex(ret->scheme, (e - s));

« previous php.cvs (#32011) next »