Merge pull request #39221 from nextcloud/bugfix/bulkUploadEmptyFiles

mgallien · web-flow · commit ec4ae84f965e · 2023-07-20T15:49:09.000+02:00
Bugfix/bulk upload empty files
diff --git a/apps/dav/lib/BulkUpload/MultipartRequestParser.php b/apps/dav/lib/BulkUpload/MultipartRequestParser.php
@@ -211,13 +211,17 @@ private function readPartContent(int $length, string $md5): string {
 			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.");
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -211,13 +211,17 @@ private function readPartContent(int $length, string $md5): string {`
`211`	`211`	`throw new BadRequest("Computed md5 hash is incorrect.");`
`212`	`212`	`}`
`213`	`213`
`214`		`- $content = stream_get_line($this->stream, $length);`
	`214`	`+ if ($length === 0) {`
	`215`	`+ $content = '';`
	`216`	`+ } else {`
	`217`	`+ $content = stream_get_line($this->stream, $length);`
	`218`	`+ }`
`215`	`219`
`216`	`220`	`if ($content === false) {`
`217`	`221`	`throw new Exception("Fail to read part's content.");`
`218`	`222`	`}`
`219`	`223`
`220`		`- if (feof($this->stream)) {`
	`224`	`+ if ($length !== 0 && feof($this->stream)) {`
`221`	`225`	`throw new Exception("Unexpected EOF while reading stream.");`
`222`	`226`	`}`
`223`	`227`