warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: Fixes span reader ReadString (#1539)

Browse source
This commit is contained in:
Kamron Batman 2023-10-11 13:41:24 -07:00 • committed by GitHub
parent 0018901a79
commit 1ebaf5390d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Projects/Server/Buffers/SpanReader.cs
View file

@ -168,6 +168,11 @@ public ref struct SpanReader
[MethodImpl(MethodImplOptions.AggressiveInlining)] [MethodImpl(MethodImplOptions.AggressiveInlining)]
public string ReadString(Encoding encoding, bool safeString = false, int fixedLength = -1) public string ReadString(Encoding encoding, bool safeString = false, int fixedLength = -1)
{ {
if (fixedLength == 0)
{
return "";
}
int byteLength = encoding.GetByteLengthForEncoding(); int byteLength = encoding.GetByteLengthForEncoding();
bool isFixedLength = fixedLength > -1; bool isFixedLength = fixedLength > -1;
@ -191,8 +196,10 @@ public ref struct SpanReader
var span = _buffer.Slice(Position, size); var span = _buffer.Slice(Position, size);
var index = span.IndexOfTerminator(byteLength); var index = span.IndexOfTerminator(byteLength);
Position += isFixedLength || index < 0 ? size : index; Position += isFixedLength || index < 0 ? size : index;
return TextEncoding.GetString(span[..index], encoding, safeString);
// The string is either as long as the first terminator character, remaining buffer size, or fixed length.
return TextEncoding.GetString(span[..(index < 0 ? size : index)], encoding, safeString);
} }
[MethodImpl(MethodImplOptions.AggressiveInlining)] [MethodImpl(MethodImplOptions.AggressiveInlining)]

1
Projects/Server/Text/StringHelpers.cs
View file

@ -277,6 +277,7 @@ public static class StringHelpers
_ => buffer.IndexOf((byte)0) _ => buffer.IndexOf((byte)0)
}; };
// TODO: If returns -1, do not multiply by the byte length
[MethodImpl(MethodImplOptions.AggressiveInlining)] [MethodImpl(MethodImplOptions.AggressiveInlining)]
public static int IndexOfTerminator(this ReadOnlySpan<byte> buffer, int sizeT) => public static int IndexOfTerminator(this ReadOnlySpan<byte> buffer, int sizeT) =>
sizeT switch sizeT switch

2
Projects/UOContent/Engines/Quests/Core/Items/DynamicTeleporter.cs
View file

@ -3,7 +3,7 @@ using Server.Mobiles;
namespace Server.Engines.Quests; namespace Server.Engines.Quests;
[SerializationGenerator(0)] [SerializationGenerator(0, false)]
public abstract partial class DynamicTeleporter : Item public abstract partial class DynamicTeleporter : Item
{ {
public DynamicTeleporter(int itemID = 0x1822, int hue = 0x482) : base(itemID) public DynamicTeleporter(int itemID = 0x1822, int hue = 0x482) : base(itemID)

2
Projects/UOContent/Engines/Quests/Emino's Undertaking/Items/EminosKatanaChest.cs
View file

@ -5,7 +5,7 @@ using Server.Network;
namespace Server.Engines.Quests.Ninja; namespace Server.Engines.Quests.Ninja;
[SerializationGenerator(0, false)] [SerializationGenerator(0)]
public partial class EminosKatanaChest : WoodenChest public partial class EminosKatanaChest : WoodenChest
{ {
[Constructible] [Constructible]