From b093ca90d3e32aae681cb6bf720d6b2778402f7d Mon Sep 17 00:00:00 2001 From: Nemirtingas Date: Sun, 16 Jun 2019 15:12:22 +0200 Subject: [PATCH 1/5] Fix issue #14 This commit fixes game crash in ETS2. The parameter order is wrong, 1st param is what to replace and 2nd param is with what to replace. --- dll/local_storage.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/local_storage.cpp b/dll/local_storage.cpp index 80f815c5..fbc543e0 100644 --- a/dll/local_storage.cpp +++ b/dll/local_storage.cpp @@ -636,7 +636,7 @@ bool Local_Storage::iterate_file(std::string folder, int index, char *output_fil std::string name = desanitize_file_name(files[index].name); if (output_size) *output_size = file_size(folder, name); #if defined(STEAM_WIN32) - name = replace_with(name, PATH_SEPARATOR, "/"); + name = replace_with(name, "/", PATH_SEPARATOR); #endif strcpy(output_filename, name.c_str()); return true; From e54072918ff3a2d3cfd8618b3acb9afa1120bed2 Mon Sep 17 00:00:00 2001 From: Nemirtingas Date: Mon, 17 Jun 2019 23:08:23 +0200 Subject: [PATCH 2/5] Added check on directory in Local_Storage::file_exists Added check on directory in Local_Storage::file_exists. Added check in get_filenames_recursive if last char is the path separator (some use cases were adding a path separator even if there were already one). In base.h, added check on s and r, that will avoid an out-of-range vector exception on Visual Studio, same for network.cpp. --- dll/base.h | 3 ++- dll/local_storage.cpp | 11 +++++++++-- dll/network.cpp | 5 ++++- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/dll/base.h b/dll/base.h index 7e08258d..5999799b 100644 --- a/dll/base.h +++ b/dll/base.h @@ -93,7 +93,8 @@ struct Steam_Call_Result { Steam_Call_Result(SteamAPICall_t a, int icb, void *r, unsigned int s, double r_in, bool run_cc_cb) { api_call = a; result.resize(s); - memcpy(&(result[0]), r, s); + if (s > 0 && r != NULL) + memcpy(&(result[0]), r, s); created = std::chrono::high_resolution_clock::now(); run_in = r_in; run_call_completed_cb = run_cc_cb; diff --git a/dll/local_storage.cpp b/dll/local_storage.cpp index fbc543e0..c68979fc 100644 --- a/dll/local_storage.cpp +++ b/dll/local_storage.cpp @@ -192,6 +192,8 @@ static std::vector get_filenames(std::string strPath) static std::vector get_filenames_recursive(std::string base_path) { + if (base_path.back() == *PATH_SEPARATOR) + base_path.pop_back(); std::vector output; std::string strPath = base_path; strPath = strPath.append("\\*"); @@ -211,10 +213,11 @@ static std::vector get_filenames_recursive(std::string base_pa std::string dir_name = ffd.cFileName; std::string path = base_path; - path += "\\"; + path += PATH_SEPARATOR; path += dir_name; std::vector lower = get_filenames_recursive(path); + // output.push_back(File_Data{ dir_name }); Is this needed ? Add folder name to the list of files ? std::transform(lower.begin(), lower.end(), std::back_inserter(output), [dir_name](File_Data f) {f.name = dir_name + "\\" + f.name; return f;}); } else { File_Data f; @@ -584,6 +587,10 @@ bool Local_Storage::file_exists(std::string folder, std::string file) std::string full_path = save_directory + appid + folder + file; struct stat buffer; + + if (GetFileAttributes(full_path.c_str()) & FILE_ATTRIBUTE_DIRECTORY) + return false; + return (stat (full_path.c_str(), &buffer) == 0); } @@ -636,7 +643,7 @@ bool Local_Storage::iterate_file(std::string folder, int index, char *output_fil std::string name = desanitize_file_name(files[index].name); if (output_size) *output_size = file_size(folder, name); #if defined(STEAM_WIN32) - name = replace_with(name, "/", PATH_SEPARATOR); + name = replace_with(name, PATH_SEPARATOR, "/"); #endif strcpy(output_filename, name.c_str()); return true; diff --git a/dll/network.cpp b/dll/network.cpp index db87adcb..b85ce3f3 100644 --- a/dll/network.cpp +++ b/dll/network.cpp @@ -379,7 +379,10 @@ unsigned int receive_buffer_amount(sock_t sock) static void send_tcp_pending(struct TCP_Socket &socket) { - int len = send(socket.sock, &(socket.send_buffer[0]), socket.send_buffer.size(), MSG_NOSIGNAL); + size_t buf_size = socket.send_buffer.size(); + if (buf_size == 0) return; + + int len = send(socket.sock, &(socket.send_buffer[0]), buf_size, MSG_NOSIGNAL); if (len <= 0) return; socket.send_buffer.erase(socket.send_buffer.begin(), socket.send_buffer.begin() + len); From 717808e7965f9a3e3fad85713a9e49dc115a35b2 Mon Sep 17 00:00:00 2001 From: Nemirtingas Date: Tue, 18 Jun 2019 10:55:17 +0200 Subject: [PATCH 3/5] Updated for the linux case. --- dll/local_storage.cpp | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/dll/local_storage.cpp b/dll/local_storage.cpp index c68979fc..b701b266 100644 --- a/dll/local_storage.cpp +++ b/dll/local_storage.cpp @@ -217,7 +217,7 @@ static std::vector get_filenames_recursive(std::string base_pa path += dir_name; std::vector lower = get_filenames_recursive(path); - // output.push_back(File_Data{ dir_name }); Is this needed ? Add folder name to the list of files ? + output.push_back(File_Data{ dir_name });// Is this needed ? Add folder name to the list of files ? std::transform(lower.begin(), lower.end(), std::back_inserter(output), [dir_name](File_Data f) {f.name = dir_name + "\\" + f.name; return f;}); } else { File_Data f; @@ -587,11 +587,19 @@ bool Local_Storage::file_exists(std::string folder, std::string file) std::string full_path = save_directory + appid + folder + file; struct stat buffer; - - if (GetFileAttributes(full_path.c_str()) & FILE_ATTRIBUTE_DIRECTORY) + + if (stat(full_path.c_str(), &buffer) != 0) return false; - return (stat (full_path.c_str(), &buffer) == 0); +#if defined(STEAM_WIN32) + if ( buffer.st_mode & _S_IFDIR) + return false; +#else + if (S_ISDIR(buffer.st_mode)) + return false; +#endif + + return true; } unsigned int Local_Storage::file_size(std::string folder, std::string file) From a1d336bf567c6b7d85a7d565f9db358c25f89cd9 Mon Sep 17 00:00:00 2001 From: Nemirtingas Date: Wed, 19 Jun 2019 18:39:14 +0200 Subject: [PATCH 4/5] Pass dir_name by reference Passing dir_name by reference will save a copy constructor. --- dll/local_storage.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dll/local_storage.cpp b/dll/local_storage.cpp index b701b266..78d30602 100644 --- a/dll/local_storage.cpp +++ b/dll/local_storage.cpp @@ -218,7 +218,7 @@ static std::vector get_filenames_recursive(std::string base_pa std::vector lower = get_filenames_recursive(path); output.push_back(File_Data{ dir_name });// Is this needed ? Add folder name to the list of files ? - std::transform(lower.begin(), lower.end(), std::back_inserter(output), [dir_name](File_Data f) {f.name = dir_name + "\\" + f.name; return f;}); + std::transform(lower.begin(), lower.end(), std::back_inserter(output), [&dir_name](File_Data f) {f.name = dir_name + "\\" + f.name; return f;}); } else { File_Data f; f.name = ffd.cFileName; @@ -357,7 +357,7 @@ static std::vector get_filenames_recursive(std::string base_pa path += dir_name; std::vector lower = get_filenames_recursive(path); - std::transform(lower.begin(), lower.end(), std::back_inserter(output), [dir_name](File_Data f) {f.name = dir_name + "/" + f.name; return f;}); + std::transform(lower.begin(), lower.end(), std::back_inserter(output), [&dir_name](File_Data f) {f.name = dir_name + "/" + f.name; return f;}); } } } From 72d7d15adc32ee6d401f532a7d06ae6449a424f1 Mon Sep 17 00:00:00 2001 From: Nemirtingas Date: Wed, 19 Jun 2019 18:43:14 +0200 Subject: [PATCH 5/5] Added the line to push dir name on linux --- dll/local_storage.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/dll/local_storage.cpp b/dll/local_storage.cpp index 78d30602..3f0e5b21 100644 --- a/dll/local_storage.cpp +++ b/dll/local_storage.cpp @@ -357,6 +357,7 @@ static std::vector get_filenames_recursive(std::string base_pa path += dir_name; std::vector lower = get_filenames_recursive(path); + output.push_back(File_Data{ dir_name });// Is this needed ? Add folder name to the list of files ? std::transform(lower.begin(), lower.end(), std::back_inserter(output), [&dir_name](File_Data f) {f.name = dir_name + "/" + f.name; return f;}); } }