From ff3e0c0a124a13128a7594a0e33b32fa7e104745 Mon Sep 17 00:00:00 2001 From: Eladash Date: Wed, 4 Mar 2020 22:39:50 +0200 Subject: [PATCH] Fix Crypto/utils.cpp: extract_file_name --- rpcs3/Crypto/utils.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/rpcs3/Crypto/utils.cpp b/rpcs3/Crypto/utils.cpp index c5003914954c..6d2db2792ed3 100644 --- a/rpcs3/Crypto/utils.cpp +++ b/rpcs3/Crypto/utils.cpp @@ -147,7 +147,12 @@ void cmac_hash_forge(unsigned char *key, int key_len, unsigned char *in, int in_ char* extract_file_name(const char* file_path, char real_file_name[MAX_PATH]) { std::string_view v(file_path); - v = v.substr(0, v.find_last_of("/\\")); + + if (auto pos = v.find_last_of("/\\"); pos != umax) + { + v.remove_prefix(pos + 1); + } + gsl::span r(real_file_name, MAX_PATH); strcpy_trunc(r, v); return real_file_name;