github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-05-15 14:16:07 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

Core: Fix in String hashing

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@14536 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2020-06-02 08:08:49 +00:00
parent 681981d94f
commit 6afb9753b1
1 changed files with 13 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

18
uppsrc/Core/String.cpp
View file

@ -56,11 +56,19 @@ hash_t String0::LHashValue() const
{
int l = LLen();
if(l < 15) { // must be the same as small hash
dword w[4];
w[0] = w[1] = w[2] = w[3] = 0;
memcpy8((char *)w, ptr, l);
((byte *)w)[SLEN] = l;
return CombineHash(w[0], w[1], w[2], w[3]);
#ifdef HASH64
qword m[2];
m[0] = m[1] = 0;
memcpy8((char *)m, ptr, l);
((byte *)m)[SLEN] = l;
return CombineHash(m[0], m[1]);
#else
dword m[4];
m[0] = m[1] = m[2] = m[3] = 0;
memcpy8((char *)m, ptr, l);
((byte *)m)[SLEN] = l;
return CombineHash(m[0], m[1], m[2], m[3]);
#endif
}
return memhash(ptr, l);
}