calvin.erfmann/DiscordChatExporter
1
0
Fork 0
mirror of https://github.com/Tyrrrz/DiscordChatExporter.git synced 2026-03-24 23:45:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ignore unix timestamp markers with invalid offsets

Browse Source 
Fixes #681
This commit is contained in:
Tyrrrz
2021-08-28 19:17:57 +03:00
parent ac7ebd6f91
commit fcca052165
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
DiscordChatExporter.Core/Discord/Data/User.cs
View File

@@ -71,4 +71,4 @@ namespace DiscordChatExporter.Core.Discord.Data
return new User(id, isBot, discriminator, name, avatarUrl); return new User(id, isBot, discriminator, name, avatarUrl);
} }
} }
} }

11
DiscordChatExporter.Core/Markdown/Parsing/MarkdownParser.cs
View File

@@ -238,8 +238,8 @@ namespace DiscordChatExporter.Core.Markdown.Parsing
new Regex("<t:(\\d+)(?::\\w)?>", DefaultRegexOptions), new Regex("<t:(\\d+)(?::\\w)?>", DefaultRegexOptions),
(_, m) => (_, m) =>
{ {
// We don't care about the 'R' parameter because we're not going to // TODO: support formatting parameters
// show relative timestamps in an export anyway. // See: https://github.com/Tyrrrz/DiscordChatExporter/issues/662
if (!long.TryParse(m.Groups[1].Value, NumberStyles.Integer, CultureInfo.InvariantCulture, if (!long.TryParse(m.Groups[1].Value, NumberStyles.Integer, CultureInfo.InvariantCulture,
out var offset)) out var offset))
@@ -247,6 +247,13 @@ namespace DiscordChatExporter.Core.Markdown.Parsing
return null; return null;
} }
// Bound check
// https://github.com/Tyrrrz/DiscordChatExporter/issues/681
if (offset < TimeSpan.MinValue.TotalSeconds || offset > TimeSpan.MaxValue.TotalSeconds)
{
return null;
}
return new UnixTimestampNode(DateTimeOffset.UnixEpoch + TimeSpan.FromSeconds(offset)); return new UnixTimestampNode(DateTimeOffset.UnixEpoch + TimeSpan.FromSeconds(offset));
} }
); );