mirror of
https://git.postgresql.org/git/postgresql.git
synced 2024-12-03 08:00:21 +08:00
Fix stack clobber in new uuid-ossp code.
The V5 (SHA1 hashing) code wrote 20 bytes into a 16-byte local variable. This had accidentally failed to fail in my testing and Matteo's, but buildfarm results exposed the problem.
This commit is contained in:
parent
8232d6df4c
commit
2103218dd4
@ -316,16 +316,19 @@ uuid_generate_internal(int v, unsigned char *ns, char *ptr, int len)
|
||||
MD5Init(&ctx);
|
||||
MD5Update(&ctx, ns, sizeof(uu));
|
||||
MD5Update(&ctx, (unsigned char *) ptr, len);
|
||||
/* we assume sizeof MD5 result is 16, same as UUID size */
|
||||
MD5Final((unsigned char *) &uu, &ctx);
|
||||
}
|
||||
else
|
||||
{
|
||||
SHA1_CTX ctx;
|
||||
unsigned char sha1result[SHA1_RESULTLEN];
|
||||
|
||||
SHA1Init(&ctx);
|
||||
SHA1Update(&ctx, ns, sizeof(uu));
|
||||
SHA1Update(&ctx, (unsigned char *) ptr, len);
|
||||
SHA1Final((unsigned char *) &uu, &ctx);
|
||||
SHA1Final(sha1result, &ctx);
|
||||
memcpy(&uu, sha1result, sizeof(uu));
|
||||
}
|
||||
|
||||
/* the calculated hash is using local order */
|
||||
|
Loading…
Reference in New Issue
Block a user