AliveDevil/pdns-dhcp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix Kea Dhcp parser

Browse source
This commit is contained in:
Jöran Malek 2023-12-16 00:22:22 +01:00
parent 1f51a65f35
commit 3ce0297682
1 changed files with 17 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/pdns-dhcp/Kea/KeaDhcpLease.cs
View file

@ -28,20 +28,28 @@ public static class KeaDhcpLease
{ {
writer.Write(reader.Read(esc_pos)); writer.Write(reader.Read(esc_pos));
reader.Advance(EscapeTag.Length); reader.Advance(EscapeTag.Length);
if (EscapeTag.Length <= reader.RemainingCount - 2)
bool converted = false;
char escapedChar = default;
if (reader.RemainingCount >= 2)
{ {
var digits = reader.Read(2); if (byte.TryParse(reader.RemainingSpan[..2], NumberStyles.AllowHexSpecifier, null, out var b))
if (byte.TryParse(digits, NumberStyles.AllowHexSpecifier, null, out var escaped_char))
{ {
writer.Write((char)escaped_char); converted = true;
} escapedChar = (char)b;
else reader.Advance(2);
{
writer.Write(EscapeTag);
writer.Write(digits);
} }
} }
if (converted)
{
writer.Write(escapedChar);
}
else
{
writer.Write(EscapeTag);
}
esc_pos = reader.RemainingSpan.IndexOf(EscapeTag); esc_pos = reader.RemainingSpan.IndexOf(EscapeTag);
if (esc_pos == -1) if (esc_pos == -1)
{ {