Mirrors/lgogdownloader
2
0
Fork 0
mirror of https://github.com/Sude-/lgogdownloader.git synced 2024-11-20 11:49:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix_rhash_memory_corruption' of https://github.com/nathanel23/lgogdownloader

Browse Source
This commit is contained in:
Sude 2019-01-06 14:06:31 +02:00
commit 178ca66997
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
main.cpp
View File

@ -26,6 +26,8 @@ template<typename T> void set_vm_value(std::map<std::string, bpo::variable_value
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
rhash_library_init();
// Constants for option selection with include/exclude // Constants for option selection with include/exclude
/* TODO: Add options to give better control for user /* TODO: Add options to give better control for user
For example: option to select base game and DLC installers separately, For example: option to select base game and DLC installers separately,

9
src/util.cpp
View File

@ -59,9 +59,8 @@ std::string Util::makeRelativeFilepath(const std::string& path, const std::strin
std::string Util::getFileHash(const std::string& filename, unsigned hash_id) std::string Util::getFileHash(const std::string& filename, unsigned hash_id)
{ {
unsigned char digest[rhash_get_digest_size(hash_id)]; unsigned char digest[rhash_get_digest_size(hash_id)];
char result[rhash_get_hash_length(hash_id)]; char result[rhash_get_hash_length(hash_id) + 1];
rhash_library_init();
int i = rhash_file(hash_id, filename.c_str(), digest); int i = rhash_file(hash_id, filename.c_str(), digest);
if (i < 0) if (i < 0)
std::cerr << "LibRHash error: " << strerror(errno) << std::endl; std::cerr << "LibRHash error: " << strerror(errno) << std::endl;
@ -74,9 +73,8 @@ std::string Util::getFileHash(const std::string& filename, unsigned hash_id)
std::string Util::getChunkHash(unsigned char *chunk, uintmax_t chunk_size, unsigned hash_id) std::string Util::getChunkHash(unsigned char *chunk, uintmax_t chunk_size, unsigned hash_id)
{ {
unsigned char digest[rhash_get_digest_size(hash_id)]; unsigned char digest[rhash_get_digest_size(hash_id)];
char result[rhash_get_hash_length(hash_id)]; char result[rhash_get_hash_length(hash_id) + 1];
rhash_library_init();
int i = rhash_msg(hash_id, chunk, chunk_size, digest); int i = rhash_msg(hash_id, chunk, chunk_size, digest);
if (i < 0) if (i < 0)
std::cerr << "LibRHash error: " << strerror(errno) << std::endl; std::cerr << "LibRHash error: " << strerror(errno) << std::endl;
@ -141,7 +139,6 @@ int Util::createXML(std::string filepath, uintmax_t chunk_size, std::string xml_
std::cout << "Getting MD5 for chunks" << std::endl; std::cout << "Getting MD5 for chunks" << std::endl;
rhash rhash_context; rhash rhash_context;
rhash_library_init();
rhash_context = rhash_init(RHASH_MD5); rhash_context = rhash_init(RHASH_MD5);
if(!rhash_context) if(!rhash_context)
{ {
@ -149,7 +146,7 @@ int Util::createXML(std::string filepath, uintmax_t chunk_size, std::string xml_
fclose(infile); fclose(infile);
return res; return res;
} }
char rhash_result[rhash_get_hash_length(RHASH_MD5)]; char rhash_result[rhash_get_hash_length(RHASH_MD5) + 1];
for (i = 0; i < chunks; i++) { for (i = 0; i < chunks; i++) {
uintmax_t range_begin = i*chunk_size; uintmax_t range_begin = i*chunk_size;