summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2020-09-17 10:54:09 -0400
committerLioncash <mathew1800@gmail.com>2020-09-17 10:54:12 -0400
commit057aa6275d4bfcdf043d0181d5284ca2023faaf2 (patch)
tree916ce4df44cb507e680c9949c125c35c59dddb8c /src
parent78b1bc3b619dd441d10f1131bca7ccf260ed4e80 (diff)
service/sm: Slightly more efficient string name validation
We can check the end of the string first for null-termination, rather than the beginning of the string.
Diffstat (limited to 'src')
-rw-r--r--src/core/hle/service/sm/sm.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/hle/service/sm/sm.cpp b/src/core/hle/service/sm/sm.cpp
index 2aedc93ea..9c1da361b 100644
--- a/src/core/hle/service/sm/sm.cpp
+++ b/src/core/hle/service/sm/sm.cpp
@@ -27,11 +27,11 @@ void ServiceManager::InvokeControlRequest(Kernel::HLERequestContext& context) {
}
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);
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");
return ERR_INVALID_NAME;
}