diff --git a/engine/shared/library/sharedFile/src/shared/FileStreamer.cpp b/engine/shared/library/sharedFile/src/shared/FileStreamer.cpp index 18f57271..6c47b26c 100644 --- a/engine/shared/library/sharedFile/src/shared/FileStreamer.cpp +++ b/engine/shared/library/sharedFile/src/shared/FileStreamer.cpp @@ -229,7 +229,7 @@ int FileStreamer::File::read(int offset, void *destinationBuffer, int numberOfBy newRequest->bytesRead = 0; newRequest->gate = gate; newRequest->priority = priority; - newRequest->returnValue = returnValue; + newRequest->returnValue = &returnValue; // submit the request FileStreamerThread::submitRequest(newRequest); diff --git a/external/3rd/library/platform/utils/Base/MD5.cpp b/external/3rd/library/platform/utils/Base/MD5.cpp index 7fa9f806..e4423590 100644 --- a/external/3rd/library/platform/utils/Base/MD5.cpp +++ b/external/3rd/library/platform/utils/Base/MD5.cpp @@ -52,7 +52,7 @@ namespace Base Update(input); } - vector MD5::Decode(vector achar0, int i, int j) + vector MD5::Decode(const vector &achar0, int i, int j) { vector ai(16,0); int l; @@ -66,9 +66,9 @@ namespace Base return ai; } - vector MD5::Encode(vector ai, int i) + vector MD5::Encode(const vector &ai, int i) { - vector achar0(i,0); + const vector &achar0(i,0); int k; int j = k = 0; for(; k < i; k += 4){ @@ -93,7 +93,7 @@ namespace Base if (finalsNull) { State &state1 = state; - vector achar0 = Encode(state1.count, 8); + const vector &achar0 = Encode(state1.count, 8); int i = state1.count[0] >> 3 & 0x3f; int j = i >= 56 ? 120 - i : 56 - i; Update(state1, padding, 0, j); @@ -132,7 +132,7 @@ namespace Base finalsNull = true; } - void MD5::Transform(State & state1, vector achar0, int i) + void MD5::Transform(State & state1, const vector &achar0, int i) { int j = state1.state[0]; int k = state1.state[1]; @@ -211,12 +211,12 @@ namespace Base void MD5::Update(char char0) { - vector achar0(1,0); + const vector &achar0(1,0); achar0[0] = char0; Update(achar0, 1); } - void MD5::Update(State & state1, vector achar0, int i, int j) + void MD5::Update(State & state1, const vector &achar0, int i, int j) { finalsNull = true; if (j - i > (int)achar0.size()) @@ -258,17 +258,17 @@ namespace Base Update( achar, achar.size() ); } - void MD5::Update(vector achar0) + void MD5::Update(const vector &achar0) { Update(achar0, 0, achar0.size()); } - void MD5::Update(vector achar0, int i) + void MD5::Update(const vector &achar0, int i) { Update(state, achar0, 0, i); } - void MD5::Update(vector achar0, int i, int j) + void MD5::Update(const vector &achar0, int i, int j) { Update(state, achar0, i, j); } @@ -278,7 +278,7 @@ namespace Base return asHex(Final()); } - string MD5::asHex(vector achar0) + string MD5::asHex(const vector &achar0) { const string hex = "0123456789abcdef"; diff --git a/external/3rd/library/platform/utils/Base/MD5.h b/external/3rd/library/platform/utils/Base/MD5.h index 374a2da8..04003b6a 100644 --- a/external/3rd/library/platform/utils/Base/MD5.h +++ b/external/3rd/library/platform/utils/Base/MD5.h @@ -36,22 +36,22 @@ namespace Base void Init(); std::vector Final(); void Update(char char0); - void Update(State & state1, std::vector achar0, int i, int j); + void Update(State & state1, const std::vector &achar0, int i, int j); void Update(std::string s); - void Update(std::vector achar0); - void Update(std::vector achar0, int i); - void Update(std::vector achar0, int i, int j); + void Update(const std::vector &achar0); + void Update(const std::vector &achar0, int i); + void Update(const std::vector &achar0, int i, int j); std::string asHex(); - static std::string asHex(std::vector achar0); + static std::string asHex(const std::vector &achar0); private: - std::vector Decode(std::vector achar0, int i, int j); - std::vector Encode(std::vector ai, int i); + std::vector Decode(const std::vector &achar0, int i, int j); + std::vector Encode(const std::vector &ai, int i); int FF(int i, int j, int k, int l, int i1, int j1, int k1); int GG(int i, int j, int k, int l, int i1, int j1, int k1); int HH(int i, int j, int k, int l, int i1, int j1, int k1); int II(int i, int j, int k, int l, int i1, int j1, int k1); - void Transform(State & state1, std::vector achar0, int i); + void Transform(State & state1, const std::vector &achar0, int i); int rotate_left(int i, int j); int uadd(int i, int j); int uadd(int i, int j, int k); diff --git a/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Base/monitorData.cpp b/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Base/monitorData.cpp index f9e7d1af..b1651235 100644 --- a/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Base/monitorData.cpp +++ b/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Base/monitorData.cpp @@ -326,6 +326,8 @@ int x; return 0; } + size_t desP1 = (strlen(des) + 1); + for(x=0;x