Mirrors/yuzu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

service/sm: Slightly more efficient string name validation

Browse source 
We can check the end of the string first for null-termination, rather
than the beginning of the string.
This commit is contained in:
Lioncash 2020-09-17 10:54:09 -04:00
parent 78b1bc3b61
commit 057aa6275d
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/core/hle/service/sm/sm.cpp
View file

@ -27,11 +27,11 @@ void ServiceManager::InvokeControlRequest(Kernel::HLERequestContext& context) {
} }
static ResultCode ValidateServiceName(const std::string& name) { static ResultCode ValidateServiceName(const std::string& name) {
if (name.size() <= 0 || name.size() > 8) { if (name.empty() || name.size() > 8) {
LOG_ERROR(Service_SM, "Invalid service name! service={}", name); LOG_ERROR(Service_SM, "Invalid service name! service={}", name);
return ERR_INVALID_NAME; return ERR_INVALID_NAME;
} }
if (name.find('\0') != std::string::npos) { if (name.rfind('\0') != std::string::npos) {
LOG_ERROR(Service_SM, "A non null terminated service was passed"); LOG_ERROR(Service_SM, "A non null terminated service was passed");
return ERR_INVALID_NAME; return ERR_INVALID_NAME;
} }