Backups/RAGECOOP-V
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix memory stream close on send

Browse Source
This commit is contained in:
sardelka9515
2022-08-23 13:22:14 +08:00
parent 8ff08e0804
commit 636ee3a33f
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
RageCoop.Server/Networking/Server.cs
View File

@ -299,7 +299,10 @@ namespace RageCoop.Server
} }
internal void SendFile(string path,string name,Client client,Action<float> updateCallback=null) internal void SendFile(string path,string name,Client client,Action<float> updateCallback=null)
{ {
SendFile(File.OpenRead(path), name,client,NewFileID(),updateCallback); var fs = File.OpenRead(path);
SendFile(fs, name,client,NewFileID(),updateCallback);
fs.Close();
fs.Dispose();
} }
internal void SendFile(Stream stream, string name, Client client,int id=default, Action<float> updateCallback = null) internal void SendFile(Stream stream, string name, Client client,int id=default, Action<float> updateCallback = null)
{ {
@ -317,8 +320,8 @@ namespace RageCoop.Server
}, ConnectionChannel.File)?.Response!=FileResponse.NeedToDownload) }, ConnectionChannel.File)?.Response!=FileResponse.NeedToDownload)
{ {
Logger?.Info($"Skipping file transfer \"{name}\" to {client.Username}"); Logger?.Info($"Skipping file transfer \"{name}\" to {client.Username}");
stream.Close(); // stream.Close();
stream.Dispose(); // stream.Dispose();
return; return;
} }
Logger?.Debug($"Initiating file transfer:{name}, {total}"); Logger?.Debug($"Initiating file transfer:{name}, {total}");
@ -359,8 +362,8 @@ namespace RageCoop.Server
{ {
Logger.Warning($"File trasfer to {client.Username} failed: "+name); Logger.Warning($"File trasfer to {client.Username} failed: "+name);
} }
stream.Close(); // stream.Close();
stream.Dispose(); // stream.Dispose();
Logger?.Debug($"All file chunks sent:{name}"); Logger?.Debug($"All file chunks sent:{name}");
InProgressFileTransfers.Remove(id); InProgressFileTransfers.Remove(id);
} }

4
RageCoop.Server/Properties/AssemblyInfo.cs
View File

@ -15,7 +15,7 @@ using System.Resources;
[assembly: AssemblyCulture("")] [assembly: AssemblyCulture("")]
// Version information // Version information
[assembly: AssemblyVersion("1.5.2.98")] [assembly: AssemblyVersion("1.5.2.105")]
[assembly: AssemblyFileVersion("1.5.2.98")] [assembly: AssemblyFileVersion("1.5.2.105")]
[assembly: NeutralResourcesLanguageAttribute( "en-US" )] [assembly: NeutralResourcesLanguageAttribute( "en-US" )]