cvs: php-src(PHP_5_0) /ext/standard url.c
| From: | Ilia Alshanetsky | Date: | Thu, 26 May 2005 03:56:35 +0000 |
| Subject: | cvs: php-src(PHP_5_0) /ext/standard url.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-32012@lists.php.net to get a copy of this message | ||
iliaa Wed May 25 23:56:35 2005 EDT
Modified files: (Branch: PHP_5_0)
/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.81.2.3&r2=1.81.2.4&ty=u
Index: php-src/ext/standard/url.c
diff -u php-src/ext/standard/url.c:1.81.2.3 php-src/ext/standard/url.c:1.81.2.4
--- php-src/ext/standard/url.c:1.81.2.3 Mon Apr 25 19:48:30 2005
+++ php-src/ext/standard/url.c Wed May 25 23:56:34 2005
@@ -15,7 +15,7 @@
| Author: Jim Winstead <jimw@php.net> |
+----------------------------------------------------------------------+
*/
-/* $Id: url.c,v 1.81.2.3 2005/04/25 23:48:30 iliaa Exp $ */
+/* $Id: url.c,v 1.81.2.4 2005/05/26 03:56:34 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));