0 byte file uploads are valid, avoid choking on them

This commit is contained in:
Zeev Suraski 2002-05-11 11:58:16 +00:00
parent 70f72d0568
commit 19b7861d70

View file

@ -33,6 +33,8 @@
#include "rfc1867.h" #include "rfc1867.h"
#undef DEBUG_FILE_UPLOAD
#define SAFE_RETURN { \ #define SAFE_RETURN { \
if (lbuf) efree(lbuf); \ if (lbuf) efree(lbuf); \
if (abuf) efree(abuf); \ if (abuf) efree(abuf); \
@ -752,19 +754,19 @@ SAPI_API SAPI_POST_HANDLER_FUNC(rfc1867_post_handler)
} }
fclose(fp); fclose(fp);
#ifdef DEBUG_FILE_UPLOAD
if(strlen(filename) > 0 && total_bytes == 0) { if(strlen(filename) > 0 && total_bytes == 0) {
sapi_module.sapi_error(E_WARNING, "Uploaded file size 0 - file [%s=%s] not saved", param, filename); sapi_module.sapi_error(E_WARNING, "Uploaded file size 0 - file [%s=%s] not saved", param, filename);
cancel_upload = UPLOAD_ERROR_E; cancel_upload = UPLOAD_ERROR_E;
} }
#endif
if (cancel_upload || total_bytes == 0) { if (cancel_upload) {
if (temp_filename) { if (temp_filename) {
unlink(temp_filename); unlink(temp_filename);
efree(temp_filename); efree(temp_filename);
} }
temp_filename=""; temp_filename="";
} else { } else {
zend_hash_add(SG(rfc1867_uploaded_files), temp_filename, strlen(temp_filename) + 1, &temp_filename, sizeof(char *), NULL); zend_hash_add(SG(rfc1867_uploaded_files), temp_filename, strlen(temp_filename) + 1, &temp_filename, sizeof(char *), NULL);
} }