cvs: php4(PHP_4_0_6) /ext/standard url.c

sniper Mon May 14 19:04:39 2001 EDT Modified files: (Branch: PHP_4_0_6) /php4/ext/standard url.c Log: Fix bug: #1249 Index: php4/ext/standard/url.c diff -u php4/ext/standard/url.c:1.33 php4/ext/standard/url.c:1.33.4.1 --- php4/ext/standard/url.c:1.33 Sun Feb 25 22:07:23 2001 +++ php4/ext/standard/url.c Mon May 14 19:04:38 2001 @@ -15,7 +15,7 @@ | Author: Jim Winstead (jimw@php.net) | +----------------------------------------------------------------------+ */ -/* $Id: url.c,v 1.33 2001/02/26 06:07:23 andi Exp $ */ +/* $Id: url.c,v 1.33.4.1 2001/05/15 02:04:38 sniper Exp $ */ #include <stdlib.h> #include <string.h> @@ -87,27 +87,27 @@ return NULL; } /* no processing necessary on the scheme */ - if (subs[2].rm_so != -1 && subs[2].rm_so < length) { + if (subs[2].rm_so != -1 && subs[2].rm_so <= length) { ret->scheme = estrndup(str + subs[2].rm_so, subs[2].rm_eo - subs[2].rm_so); } /* the path to the resource */ - if (subs[5].rm_so != -1 && subs[5].rm_so < length) { + if (subs[5].rm_so != -1 && subs[5].rm_so <= length) { ret->path = estrndup(str + subs[5].rm_so, subs[5].rm_eo - subs[5].rm_so); } /* the query part */ - if (subs[7].rm_so != -1 && subs[7].rm_so < length) { + if (subs[7].rm_so != -1 && subs[7].rm_so <= length) { ret->query = estrndup(str + subs[7].rm_so, subs[7].rm_eo - subs[7].rm_so); } /* the fragment */ - if (subs[9].rm_so != -1 && subs[9].rm_so < length) { + if (subs[9].rm_so != -1 && subs[9].rm_so <= length) { ret->fragment = estrndup(str + subs[9].rm_so, subs[9].rm_eo - subs[9].rm_so); } /* extract the username, pass, and port from the hostname */ - if (subs[4].rm_so != -1 && subs[4].rm_so < length) { + if (subs[4].rm_so != -1 && subs[4].rm_so <= length) { int cerr; /* extract username:pass@host:port from regex results */