From 40c9c5a55c7c9e00d96f55b1cd898a51120451fe Mon Sep 17 00:00:00 2001 From: Lioncash Date: Thu, 19 Jul 2018 23:09:35 -0400 Subject: 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 --- src/core/hle/service/audio/audren_u.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/core') 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 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. +#include + #include "common/alignment.h" #include "common/logging/log.h" #include "core/core_timing.h" @@ -298,7 +300,7 @@ private: LOG_WARNING(Service_Audio, "(STUBBED) called"); IPC::RequestParser rp{ctx}; - const std::string audio_interface = "AudioInterface"; + constexpr std::array audio_interface{{"AudioInterface"}}; ctx.WriteBuffer(audio_interface); IPC::ResponseBuilder rb = rp.MakeBuilder(3, 0, 0); @@ -323,7 +325,7 @@ private: LOG_WARNING(Service_Audio, "(STUBBED) called"); IPC::RequestParser rp{ctx}; - const std::string audio_interface = "AudioDevice"; + constexpr std::array audio_interface{{"AudioDevice"}}; ctx.WriteBuffer(audio_interface); IPC::ResponseBuilder rb = rp.MakeBuilder(3, 0, 0); -- cgit v1.2.3