Rim/IW4M-Admin
Rim/IW4M-Admin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 30 Wiki Activity

modify how reading from file works to prevent accidental overreads

Browse Source
This commit is contained in:
RaidMax 2019-07-31 20:15:29 -05:00
parent 06af995202
commit 034d887abd
2 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Application/IO/GameLogEventDetection.cs
View File

@ -65,7 +65,7 @@ namespace IW4MAdmin.Application.IO
previousFileSize = fileSize;
var events = await _reader.ReadEventsFromLog(_server, fileDiff, 0);
var events = await _reader.ReadEventsFromLog(_server, fileDiff, fileSize - fileDiff);
foreach (var ev in events)
{

24
Application/IO/GameLogReader.cs
View File

@ -4,6 +4,7 @@ using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace IW4MAdmin.Application.IO
@ -37,13 +38,28 @@ namespace IW4MAdmin.Application.IO
// open the file as a stream
using (var rd = new StreamReader(new FileStream(LogFile, FileMode.Open, FileAccess.Read, FileShare.ReadWrite), Utilities.EncodingType))
{
// take the old start position and go back the number of new characters
char[] buff = new char[fileSizeDiff];
rd.BaseStream.Seek(-fileSizeDiff, SeekOrigin.End);
await rd.ReadAsync(buff, 0, (int)fileSizeDiff);
string newLine;
while (!string.IsNullOrEmpty(newLine = await rd.ReadLineAsync()))
var stringBuilder = new StringBuilder();
foreach (char c in buff)
{
logLines.Add(newLine);
if (c == '\n')
{
logLines.Add(stringBuilder.ToString());
stringBuilder = new StringBuilder();
}
else if (c != '\r')
{
stringBuilder.Append(c);
}
}
if (stringBuilder.Length > 0)
{
logLines.Add(stringBuilder.ToString());
}
}