tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix off-by-one error in LocalizedDatasetPrototype (#28366)

Browse Source
This commit is contained in:
Tayrtahn
2024-05-28 23:37:03 -04:00
committed by GitHub
parent c53b5d422d
commit 7f9ed797af
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Shared/Dataset/LocalizedDatasetPrototype.cs
View File

@@ -47,9 +47,9 @@ public sealed partial class LocalizedDatasetValues : IReadOnlyList<string>
{ {
get get
{ {
if (index > Count || index < 0) if (index >= Count || index < 0)
throw new IndexOutOfRangeException(); throw new IndexOutOfRangeException();
return Prefix + index; return Prefix + (index + 1);
} }
} }

14
Content.Tests/Shared/LocalizedDatasetPrototypeTest.cs
View File

@@ -46,14 +46,14 @@ public sealed class LocalizedDatasetPrototypeTest : ContentUnitTest
Assert.That(values, Has.Count.EqualTo(4)); Assert.That(values, Has.Count.EqualTo(4));
// Make sure indexing works as expected // Make sure indexing works as expected
Assert.That(values[0], Is.EqualTo("test-dataset-1")); Assert.That(testPrototype.Values[0], Is.EqualTo("test-dataset-1"));
Assert.That(values[1], Is.EqualTo("test-dataset-2")); Assert.That(testPrototype.Values[1], Is.EqualTo("test-dataset-2"));
Assert.That(values[2], Is.EqualTo("test-dataset-3")); Assert.That(testPrototype.Values[2], Is.EqualTo("test-dataset-3"));
Assert.That(values[3], Is.EqualTo("test-dataset-4")); Assert.That(testPrototype.Values[3], Is.EqualTo("test-dataset-4"));
Assert.Throws<IndexOutOfRangeException>(() => { var x = values[4]; }); Assert.Throws<IndexOutOfRangeException>(() => { var x = testPrototype.Values[4]; });
Assert.Throws<IndexOutOfRangeException>(() => { var x = values[-1]; }); Assert.Throws<IndexOutOfRangeException>(() => { var x = testPrototype.Values[-1]; });
// Make sure that the enumerator gets all of the values // Make sure that the enumerator gets all of the values
Assert.That(testPrototype.Values[testPrototype.Values.Count], Is.EqualTo("test-dataset-4")); Assert.That(testPrototype.Values[^1], Is.EqualTo("test-dataset-4"));
} }
} }