Re: cvs: php-src /main rfc1867.c

It can be closed, I think. -Andrei On Nov 11, 2005, at 9:38 AM, Antony Dovgal wrote:

Once again.. Is the bug #34362 still valid after this fix ? On 11.11.2005 20:34, Andrei Zmievski wrote:

andrei        Fri Nov 11 12:34:19 2005 EDT
  Modified files:                  /php-src/main    rfc1867.c   Log:

Re-fix Marcus's fix.

    http://cvs.php.net/diff.php/php-src/main/rfc1867.c?r1=1.177&r2=1.178&ty=u

Index: php-src/main/rfc1867.c diff -u php-src/main/rfc1867.c:1.177 php-src/main/rfc1867.c:1.178

--- php-src/main/rfc1867.c:1.177    Fri Nov 11 11:50:08 2005
+++ php-src/main/rfc1867.c    Fri Nov 11 12:34:16 2005

@@ -17,7 +17,7 @@

    +----------------------------------------------------------------------+

*/ -/* $Id: rfc1867.c,v 1.177 2005/11/11 16:50:08 helly Exp $ */ +/* $Id: rfc1867.c,v 1.178 2005/11/11 17:34:16 andrei Exp $ */ /* * This product includes software developed by the Apache Group @@ -41,7 +41,6 @@ static void safe_php_register_variable(char *var, char *strval, zval *track_vars_array, zend_bool override_protection TSRMLS_DC); #define SAFE_RETURN { \

-    php_mb_flush_gpc_variables(num_vars, val_list, len_list, array_ptr TSRMLS_CC); \
     if (lbuf) efree(lbuf); \
     if (abuf) efree(abuf); \
     if (array_index) efree(array_index); \

@@ -1045,10 +1044,6 @@

     U_STRING_DECL(filename_key, "filename", 8);
     U_STRING_DECL(maxfilesize_key, "MAX_FILE_SIZE", 13);
     static zend_bool did_string_init = FALSE;

-#if HAVE_MBSTRING && !defined(COMPILE_DL_MBSTRING)

-    int num_vars = 0, *len_list = NULL;
-    char **val_list = NULL;

-#endif

      if (SG(request_info).content_length > SG(post_max_size)) {
         sapi_module.sapi_error(E_WARNING, "POST Content-Length of %ld bytes exceeds the limit of %ld bytes", SG(request_info).content_length, SG(post_max_size));

@@ -1601,6 +1596,7 @@

         zend_llist_clean(&header);
          if (!multipart_buffer_headers(mbuff, &header TSRMLS_CC)) {
+            php_mb_flush_gpc_variables(num_vars, val_list, len_list, array_ptr TSRMLS_CC);
             SAFE_RETURN;
         }

@@ -1680,6 +1676,7 @@

             /* Return with an error if the posted data is garbled */
             if (!param && !filename) {
                 sapi_module.sapi_error(E_WARNING, "File Upload Mime headers garbled");
+                php_mb_flush_gpc_variables(num_vars, val_list, len_list, array_ptr TSRMLS_CC);
                 SAFE_RETURN;
             }

@@ -1986,6 +1983,7 @@

         }
     }
 +    php_mb_flush_gpc_variables(num_vars, val_list, len_list, array_ptr TSRMLS_CC);
     SAFE_RETURN;

}

--Wbr, Antony Dovgal