diff options
| author | 2018-07-19 23:09:35 -0400 | |
|---|---|---|
| committer | 2018-07-19 23:15:27 -0400 | |
| commit | 40c9c5a55c7c9e00d96f55b1cd898a51120451fe (patch) | |
| tree | 07a30ff9df82ba098372edeeb9502f8c64d09685 /src | |
| parent | audout_u: Use a std::array instead of std::string for holding the audio inter... (diff) | |
| download | yuzu-40c9c5a55c7c9e00d96f55b1cd898a51120451fe.tar.gz yuzu-40c9c5a55c7c9e00d96f55b1cd898a51120451fe.tar.xz yuzu-40c9c5a55c7c9e00d96f55b1cd898a51120451fe.zip | |
audren_u: Use a std::array instead of std::string for holding the audio interface/device name
std::string doesn't include the null-terminator in its data() + size()
range. This ensures that the null-terminator will also be written to the buffer
Diffstat (limited to '')
| -rw-r--r-- | src/core/hle/service/audio/audren_u.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/core/hle/service/audio/audren_u.cpp b/src/core/hle/service/audio/audren_u.cpp index 6903f52d6..e623f4f8e 100644 --- a/src/core/hle/service/audio/audren_u.cpp +++ b/src/core/hle/service/audio/audren_u.cpp | |||
| @@ -2,6 +2,8 @@ | |||
| 2 | // Licensed under GPLv2 or any later version | 2 | // Licensed under GPLv2 or any later version |
| 3 | // Refer to the license.txt file included. | 3 | // Refer to the license.txt file included. |
| 4 | 4 | ||
| 5 | #include <array> | ||
| 6 | |||
| 5 | #include "common/alignment.h" | 7 | #include "common/alignment.h" |
| 6 | #include "common/logging/log.h" | 8 | #include "common/logging/log.h" |
| 7 | #include "core/core_timing.h" | 9 | #include "core/core_timing.h" |
| @@ -298,7 +300,7 @@ private: | |||
| 298 | LOG_WARNING(Service_Audio, "(STUBBED) called"); | 300 | LOG_WARNING(Service_Audio, "(STUBBED) called"); |
| 299 | IPC::RequestParser rp{ctx}; | 301 | IPC::RequestParser rp{ctx}; |
| 300 | 302 | ||
| 301 | const std::string audio_interface = "AudioInterface"; | 303 | constexpr std::array<char, 15> audio_interface{{"AudioInterface"}}; |
| 302 | ctx.WriteBuffer(audio_interface); | 304 | ctx.WriteBuffer(audio_interface); |
| 303 | 305 | ||
| 304 | IPC::ResponseBuilder rb = rp.MakeBuilder(3, 0, 0); | 306 | IPC::ResponseBuilder rb = rp.MakeBuilder(3, 0, 0); |
| @@ -323,7 +325,7 @@ private: | |||
| 323 | LOG_WARNING(Service_Audio, "(STUBBED) called"); | 325 | LOG_WARNING(Service_Audio, "(STUBBED) called"); |
| 324 | IPC::RequestParser rp{ctx}; | 326 | IPC::RequestParser rp{ctx}; |
| 325 | 327 | ||
| 326 | const std::string audio_interface = "AudioDevice"; | 328 | constexpr std::array<char, 12> audio_interface{{"AudioDevice"}}; |
| 327 | ctx.WriteBuffer(audio_interface); | 329 | ctx.WriteBuffer(audio_interface); |
| 328 | 330 | ||
| 329 | IPC::ResponseBuilder rb = rp.MakeBuilder(3, 0, 0); | 331 | IPC::ResponseBuilder rb = rp.MakeBuilder(3, 0, 0); |