when reading an empty file getting EOF is not an error

will allow uploading empty files via bulk upload

Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>

diff --git a/apps/dav/lib/BulkUpload/MultipartRequestParser.php b/apps/dav/lib/BulkUpload/MultipartRequestParser.php
index 7554447fc93b8b8263466f35d5e6e380aede803f..16c83fee64e31fbd2805167583d81afb14df6ba7 100644 (file)
--- a/apps/dav/lib/BulkUpload/MultipartRequestParser.php
+++ b/apps/dav/lib/BulkUpload/MultipartRequestParser.php
@@ -211,13 +211,17 @@ class MultipartRequestParser {
                        throw new BadRequest("Computed md5 hash is incorrect.");
                }
 
-               $content = stream_get_line($this->stream, $length);
+               if ($length === 0) {
+                       $content = '';
+               } else {
+                       $content = stream_get_line($this->stream, $length);
+               }
 
                if ($content === false) {
                        throw new Exception("Fail to read part's content.");
                }
 
-               if (feof($this->stream)) {
+               if ($length !== 0 && feof($this->stream)) {
                        throw new Exception("Unexpected EOF while reading stream.");
                }