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

Bug 63329 - make check fails: .. contents:: :depth: 2 

Add back FcHashGetSHA256DigestFromFile() and fall back to it
when font isn't SFNT-based font because FT_Load_Sfnt_Table
fails with FT_Err_Invalid_Face_Handle.
This commit is contained in:
Akira TAGOH 2013-04-10 18:41:22 +09:00
parent 77419a4dfd
commit 03216ccf4c
3 changed files with 88 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/fcfreetype.c
View File

@ -1666,17 +1666,29 @@ FcFreeTypeQueryFace (const FT_Face face,
goto bail1;
err = FT_Load_Sfnt_Table (face, 0, 0, NULL, &len);
if (err != FT_Err_Ok)
if (err == FT_Err_Ok)
{
alen = (len + 63) & ~63;
fontdata = malloc (alen);
if (!fontdata)
goto bail1;
err = FT_Load_Sfnt_Table (face, 0, 0, (FT_Byte *)fontdata, &len);
if (err != FT_Err_Ok)
goto bail1;
memset (&fontdata[len], 0, alen - len);
hashstr = FcHashGetSHA256DigestFromMemory (fontdata, len);
}
else if (err == FT_Err_Invalid_Face_Handle)
{
/* font may not support SFNT. falling back to
* read the font data from file directly
*/
hashstr = FcHashGetSHA256DigestFromFile (file);
}
else
{
goto bail1;
alen = (len + 63) & ~63;
fontdata = malloc (alen);
if (!fontdata)
goto bail1;
err = FT_Load_Sfnt_Table (face, 0, 0, (FT_Byte *)fontdata, &len);
if (err != FT_Err_Ok)
goto bail1;
memset (&fontdata[len], 0, alen - len);
hashstr = FcHashGetSHA256DigestFromMemory (fontdata, len);
}
if (!hashstr)
goto bail1;
if (!FcPatternAddString (pat, FC_HASH, hashstr))

62
src/fchash.c
View File

@ -203,6 +203,68 @@ FcHashGetSHA256Digest (const FcChar8 *input_strings,
return FcHashSHA256ToString (ret);
}
FcChar8 *
FcHashGetSHA256DigestFromFile (const FcChar8 *filename)
{
FILE *fp = fopen ((const char *)filename, "rb");
char ibuf[64];
FcChar32 *ret;
size_t len;
struct stat st;
if (!fp)
return NULL;
if (FcStat (filename, &st))
goto bail0;
ret = FcHashInitSHA256Digest ();
if (!ret)
goto bail0;
while (!feof (fp))
{
if ((len = fread (ibuf, sizeof (char), 64, fp)) < 64)
{
long v;
/* add a padding */
memset (&ibuf[len], 0, 64 - len);
ibuf[len] = 0x80;
if ((64 - len) < 9)
{
/* process a block once */
FcHashComputeSHA256Digest (ret, ibuf);
memset (ibuf, 0, 64);
}
/* set input size at the end */
v = (long)st.st_size * 8;
ibuf[63 - 0] = v & 0xff;
ibuf[63 - 1] = (v >> 8) & 0xff;
ibuf[63 - 2] = (v >> 16) & 0xff;
ibuf[63 - 3] = (v >> 24) & 0xff;
ibuf[63 - 4] = (v >> 32) & 0xff;
ibuf[63 - 5] = (v >> 40) & 0xff;
ibuf[63 - 6] = (v >> 48) & 0xff;
ibuf[63 - 7] = (v >> 56) & 0xff;
FcHashComputeSHA256Digest (ret, ibuf);
break;
}
else
{
FcHashComputeSHA256Digest (ret, ibuf);
}
}
fclose (fp);
return FcHashSHA256ToString (ret);
bail0:
fclose (fp);
return NULL;
}
FcChar8 *
FcHashGetSHA256DigestFromMemory (const char *fontdata,
size_t length)

4
src/fcint.h
View File

@ -818,6 +818,10 @@ FcFontSetSerialize (FcSerialize *serialize, const FcFontSet * s);
FcPrivate FcChar8 *
FcHashGetSHA256Digest (const FcChar8 *input_strings,
size_t len);
FcPrivate FcChar8 *
FcHashGetSHA256DigestFromFile (const FcChar8 *filename);
FcPrivate FcChar8 *
FcHashGetSHA256DigestFromMemory (const char *fontdata,
size_t length);