archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

- Handle more error types when uploading files.

Browse source
This commit is contained in:
foobar 2001-11-24 18:23:35 +00:00
parent ee111cf9c8
commit 6083eb1030
1 changed files with 15 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

19
main/rfc1867.c
View file

@ -51,10 +51,11 @@
#define MAX_SIZE_OF_INDEX sizeof("[tmp_name]")
/* Errors */
#define UPLOAD_ERROR_A 2 /* Uploaded file exceeded upload_max_filesize */
#define UPLOAD_ERROR_B 3 /* Uploaded file exceeded MAX_FILE_SIZE */
#define UPLOAD_ERROR_C 4 /* Only partiallly uploaded */
#define UPLOAD_ERROR_A 1 /* Uploaded file exceeded upload_max_filesize */
#define UPLOAD_ERROR_B 2 /* Uploaded file exceeded MAX_FILE_SIZE */
#define UPLOAD_ERROR_C 3 /* Only partiallly uploaded */
#define UPLOAD_ERROR_D 4 /* No file uploaded */
#define UPLOAD_ERROR_E 5 /* Uploaded file size 0 bytes */
static void add_protected_variable(char *varname TSRMLS_DC)
{
@ -695,6 +696,11 @@ SAPI_API SAPI_POST_HANDLER_FUNC(rfc1867_post_handler)
total_bytes = 0;
cancel_upload = 0;
if(strlen(filename) == 0) {
sapi_module.sapi_error(E_WARNING, "No file uploaded");
cancel_upload = UPLOAD_ERROR_D;
}
while (!cancel_upload && (blen = multipart_buffer_read(mbuff, buff, sizeof(buff) TSRMLS_CC)))
{
if (total_bytes > PG(upload_max_filesize)) {
@ -715,6 +721,11 @@ SAPI_API SAPI_POST_HANDLER_FUNC(rfc1867_post_handler)
}
}
fclose(fp);
if(strlen(filename) > 0 && total_bytes == 0) {
sapi_module.sapi_error(E_WARNING, "Uploaded file size 0 - file [%s=%s] not saved", param, filename);
cancel_upload = UPLOAD_ERROR_E;
}
if (cancel_upload || total_bytes == 0) {