cvs: php-src(PHP_5_0) / NEWS /ext/soap php_sdl.c
| From: | Dmitry Stogov | Date: | Wed, 22 Sep 2004 05:57:36 +0000 |
| Subject: | cvs: php-src(PHP_5_0) / NEWS /ext/soap php_sdl.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-28732@lists.php.net to get a copy of this message | ||
dmitry Wed Sep 22 01:57:36 2004 EDT
Modified files: (Branch: PHP_5_0)
/php-src NEWS
/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/NEWS?r1=1.1760.2.76&r2=1.1760.2.77&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.76 php-src/NEWS:1.1760.2.77
--- php-src/NEWS:1.1760.2.76 Mon Sep 20 01:14:34 2004
+++ php-src/NEWS Wed Sep 22 01:57:36 2004
@@ -14,6 +14,7 @@
- Renamed SoapClient->__call() to SoapClinet->__soapCall(). (Dmitry)
- Fixed bug with raw_post_data not getting set (Brian)
- Fixed a file-descriptor leak with phpinfo() and other 'special' URLs (Zeev)
+- Fixed bug #30182 (SOAP module processing WSDL file dumps core). (Dmitry)
- Fixed bug #30045 (Cannot pass big integers (> 2147483647) in SOAP requests).
(Dmitry)
- Fixed bug #29985 (unserialize()/ __PHP_Incomplete_class does not report
http://cvs.php.net/diff.php/php-src/ext/soap/php_sdl.c?r1=1.70.2.3&r2=1.70.2.4&ty=u
Index: php-src/ext/soap/php_sdl.c
diff -u php-src/ext/soap/php_sdl.c:1.70.2.3 php-src/ext/soap/php_sdl.c:1.70.2.4
--- php-src/ext/soap/php_sdl.c:1.70.2.3 Thu Aug 26 14:36:46 2004
+++ php-src/ext/soap/php_sdl.c Wed Sep 22 01:57:36 2004
@@ -17,7 +17,7 @@
| Dmitry Stogov <dmitry@zend.com> |
+----------------------------------------------------------------------+
*/
-/* $Id: php_sdl.c,v 1.70.2.3 2004/08/26 18:36:46 dmitry Exp $ */
+/* $Id: php_sdl.c,v 1.70.2.4 2004/09/22 05:57:36 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);