diff options
| author | 2023-09-17 14:27:44 -0600 | |
|---|---|---|
| committer | 2023-09-17 14:27:44 -0600 | |
| commit | e18ff5cb4e1495ee700486e7b1a7d15bc3a1d6af (patch) | |
| tree | 49b2f189ca12a0b65169794ddd072f4cb1a734ff /src | |
| parent | Merge pull request #11524 from t895/signing-ci (diff) | |
| parent | mii_types: Remove null terminator check (diff) | |
| download | yuzu-e18ff5cb4e1495ee700486e7b1a7d15bc3a1d6af.tar.gz yuzu-e18ff5cb4e1495ee700486e7b1a7d15bc3a1d6af.tar.xz yuzu-e18ff5cb4e1495ee700486e7b1a7d15bc3a1d6af.zip | |
Merge pull request #11529 from lat9nq/no-oob-names-pls
mii_types: Remove null terminator check
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/hle/service/mii/mii_types.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/core/hle/service/mii/mii_types.h b/src/core/hle/service/mii/mii_types.h index 95476f745..611ff4f81 100644 --- a/src/core/hle/service/mii/mii_types.h +++ b/src/core/hle/service/mii/mii_types.h | |||
| @@ -606,15 +606,12 @@ struct Nickname { | |||
| 606 | static constexpr std::size_t MaxNameSize = 10; | 606 | static constexpr std::size_t MaxNameSize = 10; |
| 607 | std::array<char16_t, MaxNameSize> data; | 607 | std::array<char16_t, MaxNameSize> data; |
| 608 | 608 | ||
| 609 | // Checks for null, non-zero terminated or dirty strings | 609 | // Checks for null or dirty strings |
| 610 | bool IsValid() const { | 610 | bool IsValid() const { |
| 611 | if (data[0] == 0) { | 611 | if (data[0] == 0) { |
| 612 | return false; | 612 | return false; |
| 613 | } | 613 | } |
| 614 | 614 | ||
| 615 | if (data[MaxNameSize] != 0) { | ||
| 616 | return false; | ||
| 617 | } | ||
| 618 | std::size_t index = 1; | 615 | std::size_t index = 1; |
| 619 | while (data[index] != 0) { | 616 | while (data[index] != 0) { |
| 620 | index++; | 617 | index++; |