cvs: php-src /ext/soap php_sdl.c
| From: | Dmitry Stogov | Date: | Wed, 22 Sep 2004 05:58:41 +0000 |
| Subject: | cvs: php-src /ext/soap php_sdl.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-28733@lists.php.net to get a copy of this message | ||
dmitry Wed Sep 22 01:58:41 2004 EDT
Modified files:
/php-src/ext/soap php_sdl.c
Log:
Fixed bug #30182 (SOAP module processing WSDL file dumps core).
http://cvs.php.net/diff.php/php-src/ext/soap/php_sdl.c?r1=1.73&r2=1.74&ty=u
Index: php-src/ext/soap/php_sdl.c
diff -u php-src/ext/soap/php_sdl.c:1.73 php-src/ext/soap/php_sdl.c:1.74
--- php-src/ext/soap/php_sdl.c:1.73 Thu Aug 26 14:43:06 2004
+++ php-src/ext/soap/php_sdl.c Wed Sep 22 01:58:40 2004
@@ -17,7 +17,7 @@
| Dmitry Stogov <dmitry@zend.com> |
+----------------------------------------------------------------------+
*/
-/* $Id: php_sdl.c,v 1.73 2004/08/26 18:43:06 dmitry Exp $ */
+/* $Id: php_sdl.c,v 1.74 2004/09/22 05:58:40 dmitry Exp $ */
#include "php_soap.h"
#include "libxml/uri.h"
@@ -2168,13 +2168,14 @@
{
sdlPtr sdl = NULL;
char* old_error_code = SOAP_GLOBAL(error_code);
+ int uri_len;
SOAP_GLOBAL(error_code) = "WSDL";
- if (SOAP_GLOBAL(cache_enabled)) {
+ if (SOAP_GLOBAL(cache_enabled) && ((uri_len = strlen(uri)) < MAXPATHLEN)) {
char fn[MAXPATHLEN];
- if (strchr(uri,':') != NULL || IS_ABSOLUTE_PATH(uri,strlen(uri))) {
+ if (strchr(uri,':') != NULL || IS_ABSOLUTE_PATH(uri, uri_len)) {
strcpy(fn, uri);
} else if (VCWD_REALPATH(uri, fn) == NULL) {
sdl = load_wsdl(uri);