walkero
/
fontconfig
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix a shift count overflow on 32bit box

This commit is contained in:
Akira TAGOH 2013-06-27 12:30:56 +09:00
parent 9acc14c34a
commit 8603e58695
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/fchash.c
View File

@ -190,14 +190,14 @@ FcHashGetSHA256Digest (const FcChar8 *input_strings,
} }
/* set input size at the end */ /* set input size at the end */
len *= 8; len *= 8;
block[63 - 0] = len & 0xff; block[63 - 0] = (uint64_t)len & 0xff;
block[63 - 1] = (len >> 8) & 0xff; block[63 - 1] = ((uint64_t)len >> 8) & 0xff;
block[63 - 2] = (len >> 16) & 0xff; block[63 - 2] = ((uint64_t)len >> 16) & 0xff;
block[63 - 3] = (len >> 24) & 0xff; block[63 - 3] = ((uint64_t)len >> 24) & 0xff;
block[63 - 4] = (len >> 32) & 0xff; block[63 - 4] = ((uint64_t)len >> 32) & 0xff;
block[63 - 5] = (len >> 40) & 0xff; block[63 - 5] = ((uint64_t)len >> 40) & 0xff;
block[63 - 6] = (len >> 48) & 0xff; block[63 - 6] = ((uint64_t)len >> 48) & 0xff;
block[63 - 7] = (len >> 56) & 0xff; block[63 - 7] = ((uint64_t)len >> 56) & 0xff;
FcHashComputeSHA256Digest (ret, block); FcHashComputeSHA256Digest (ret, block);
return FcHashSHA256ToString (ret); return FcHashSHA256ToString (ret);
@ -226,7 +226,7 @@ FcHashGetSHA256DigestFromFile (const FcChar8 *filename)
{ {
if ((len = fread (ibuf, sizeof (char), 64, fp)) < 64) if ((len = fread (ibuf, sizeof (char), 64, fp)) < 64)
{ {
long v; uint64_t v;
/* add a padding */ /* add a padding */
memset (&ibuf[len], 0, 64 - len); memset (&ibuf[len], 0, 64 - len);
@ -281,7 +281,7 @@ FcHashGetSHA256DigestFromMemory (const char *fontdata,
{ {
if ((length - i) < 64) if ((length - i) < 64)
{ {
long v; uint64_t v;
size_t n; size_t n;
/* add a padding */ /* add a padding */