[PHP-CVS] cvs: php-src /ext/soap soap.c

[Dmitry Stogov]

dmitry          Mon Jan 31 09:02:21 2005 EDT

  Modified files:              
    /php-src/ext/soap   soap.c 
  Log:
  Fixed memory allocation bug
  
  
http://cvs.php.net/diff.php/php-src/ext/soap/soap.c?r1=1.132&r2=1.133&ty=u
Index: php-src/ext/soap/soap.c
diff -u php-src/ext/soap/soap.c:1.132 php-src/ext/soap/soap.c:1.133
--- php-src/ext/soap/soap.c:1.132       Fri Jan 28 05:33:46 2005
+++ php-src/ext/soap/soap.c     Mon Jan 31 09:02:19 2005
@@ -17,7 +17,7 @@
   |          Dmitry Stogov <[EMAIL PROTECTED]>                             |
   +----------------------------------------------------------------------+
 */
-/* $Id: soap.c,v 1.132 2005/01/28 10:33:46 dmitry Exp $ */
+/* $Id: soap.c,v 1.133 2005/01/31 14:02:19 dmitry Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -1862,9 +1862,10 @@
                        char* code = SOAP_GLOBAL(error_code);
                        char buffer[1024];
                        int buffer_len;
-                       zval outbuf, outbuflen;
+                       zval *outbuf = NULL;
+                       zval outbuflen;
 
-                       INIT_ZVAL(outbuf);
+                       ALLOC_INIT_ZVAL(outbuf);
                        INIT_ZVAL(outbuflen);
 
                        buffer_len = vsnprintf(buffer, sizeof(buffer)-1, 
format, args);
@@ -1878,12 +1879,13 @@
                        }
                        /* Get output buffer and send as fault detials */
                        if (php_ob_get_length(&outbuflen TSRMLS_CC) != FAILURE 
&& Z_LVAL(outbuflen) != 0) {
-                   php_ob_get_buffer(&outbuf TSRMLS_CC);
+                               ALLOC_INIT_ZVAL(outbuf);
+                   php_ob_get_buffer(outbuf TSRMLS_CC);
                        }
                        php_end_ob_buffer(0, 0 TSRMLS_CC);
 
                        INIT_ZVAL(fault_obj);
-                       set_soap_fault(&fault_obj, code, buffer, NULL, &outbuf, 
NULL TSRMLS_CC);
+                       set_soap_fault(&fault_obj, code, buffer, NULL, outbuf, 
NULL TSRMLS_CC);
                        fault = 1;
                }
 

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php