Skip to content

Commit

Permalink
Merge pull request oqtane#4800 from sbwalker/dev
Browse files Browse the repository at this point in the history
fix oqtane#4795 - ensure deterministic ordering of file parts when merging files after upload (credit @HQuast)
  • Loading branch information
sbwalker authored Nov 4, 2024
2 parents 910669f + c8a22d9 commit a8997e8
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion Oqtane.Server/Controllers/FileController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -517,7 +517,7 @@ private async Task<string> MergeFile(string folder, string filename)
bool success = true;
using (var stream = new FileStream(Path.Combine(folder, filename + ".tmp"), FileMode.Create))
{
foreach (string filepart in fileparts)
foreach (string filepart in fileparts.Order())
{
try
{
Expand Down

0 comments on commit a8997e8

Please sign in to comment.