lbarnaud Thu Sep 18 19:44:01 2008 UTC
Modified files:
/php-src/main rfc1867.c
Log:
Fixed cleaning of uploaded files
http://cvs.php.net/viewvc.cgi/php-src/main/rfc1867.c?r1=1.201&r2=1.202&diff_format=u
Index: php-src/main/rfc1867.c
diff -u php-src/main/rfc1867.c:1.201 php-src/main/rfc1867.c:1.202
--- php-src/main/rfc1867.c:1.201 Sun Sep 14 14:55:28 2008
+++ php-src/main/rfc1867.c Thu Sep 18 19:44:01 2008
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: rfc1867.c,v 1.201 2008/09/14 14:55:28 lbarnaud Exp $ */
+/* $Id: rfc1867.c,v 1.202 2008/09/18 19:44:01 lbarnaud Exp $ */
/*
* This product includes software developed by the Apache Group
@@ -1401,13 +1401,13 @@
if (cancel_upload != UPLOAD_ERROR_E) {
/* file creation failed */
unlink(ascii_temp_filename);
}
+ efree(ascii_temp_filename);
efree(temp_filename);
}
temp_filename = EMPTY_STR;
} else {
- zend_u_hash_add(SG(rfc1867_uploaded_files),
IS_UNICODE, ZSTR(temp_filename), u_strlen(temp_filename) + 1, &temp_filename,
sizeof(UChar *), NULL);
+ zend_u_hash_add(SG(rfc1867_uploaded_files),
IS_UNICODE, ZSTR(temp_filename), u_strlen(temp_filename) + 1,
&ascii_temp_filename, sizeof(char *), NULL);
}
- efree(ascii_temp_filename);
/* is_arr_upload is true when name of file upload field
* ends in [.*]
@@ -1525,6 +1525,9 @@
}
add_u_protected_variable(lbuf TSRMLS_CC);
register_u_http_post_files_variable(lbuf,
temp_filename, u_strlen(temp_filename), http_post_files, 1 TSRMLS_CC);
+ if (!cancel_upload) {
+ efree(temp_filename);
+ }
{
zval file_size, error_type;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
