|
 |
c5b8fc |
From a61e145304da86c8c35b137493bbd8fd5dd1e7f5 Mon Sep 17 00:00:00 2001
|
|
|
c5b8fc |
From: Akira TAGOH <akira@tagoh.org>
|
|
|
c5b8fc |
Date: Mon, 9 Sep 2013 19:59:31 +0900
|
|
|
c5b8fc |
Subject: [PATCH] Fix memory leaks in FcFreeTypeQueryFace
|
|
|
c5b8fc |
|
|
|
c5b8fc |
---
|
|
|
c5b8fc |
src/fcfreetype.c | 15 ++++++++++-----
|
|
|
c5b8fc |
1 file changed, 10 insertions(+), 5 deletions(-)
|
|
|
c5b8fc |
|
|
|
c5b8fc |
diff --git a/src/fcfreetype.c b/src/fcfreetype.c
|
|
|
c5b8fc |
index 02e85cb..e394307 100644
|
|
|
c5b8fc |
--- a/src/fcfreetype.c
|
|
|
c5b8fc |
+++ b/src/fcfreetype.c
|
|
|
c5b8fc |
@@ -1105,7 +1105,6 @@ FcFreeTypeQueryFace (const FT_Face face,
|
|
|
c5b8fc |
const char *tmp;
|
|
|
c5b8fc |
|
|
|
c5b8fc |
FcChar8 *hashstr = NULL;
|
|
|
c5b8fc |
- char *fontdata = NULL;
|
|
|
c5b8fc |
FT_Error err;
|
|
|
c5b8fc |
FT_ULong len = 0, alen;
|
|
|
c5b8fc |
|
|
|
c5b8fc |
@@ -1668,15 +1667,21 @@ FcFreeTypeQueryFace (const FT_Face face,
|
|
|
c5b8fc |
err = FT_Load_Sfnt_Table (face, 0, 0, NULL, &len;;
|
|
|
c5b8fc |
if (err == FT_Err_Ok)
|
|
|
c5b8fc |
{
|
|
|
c5b8fc |
+ char *fontdata;
|
|
|
c5b8fc |
+
|
|
|
c5b8fc |
alen = (len + 63) & ~63;
|
|
|
c5b8fc |
fontdata = malloc (alen);
|
|
|
c5b8fc |
if (!fontdata)
|
|
|
c5b8fc |
goto bail3;
|
|
|
c5b8fc |
err = FT_Load_Sfnt_Table (face, 0, 0, (FT_Byte *)fontdata, &len;;
|
|
|
c5b8fc |
if (err != FT_Err_Ok)
|
|
|
c5b8fc |
+ {
|
|
|
c5b8fc |
+ free (fontdata);
|
|
|
c5b8fc |
goto bail3;
|
|
|
c5b8fc |
+ }
|
|
|
c5b8fc |
memset (&fontdata[len], 0, alen - len);
|
|
|
c5b8fc |
hashstr = FcHashGetSHA256DigestFromMemory (fontdata, len);
|
|
|
c5b8fc |
+ free (fontdata);
|
|
|
c5b8fc |
}
|
|
|
c5b8fc |
else if (err == FT_Err_Invalid_Face_Handle)
|
|
|
c5b8fc |
{
|
|
|
c5b8fc |
@@ -1692,7 +1697,11 @@ FcFreeTypeQueryFace (const FT_Face face,
|
|
|
c5b8fc |
if (hashstr)
|
|
|
c5b8fc |
{
|
|
|
c5b8fc |
if (!FcPatternAddString (pat, FC_HASH, hashstr))
|
|
|
c5b8fc |
+ {
|
|
|
c5b8fc |
+ free (hashstr);
|
|
|
c5b8fc |
goto bail1;
|
|
|
c5b8fc |
+ }
|
|
|
c5b8fc |
+ free (hashstr);
|
|
|
c5b8fc |
}
|
|
|
c5b8fc |
bail3:
|
|
|
c5b8fc |
|
|
|
c5b8fc |
@@ -1783,10 +1792,6 @@ bail3:
|
|
|
c5b8fc |
bail2:
|
|
|
c5b8fc |
FcCharSetDestroy (cs);
|
|
|
c5b8fc |
bail1:
|
|
|
c5b8fc |
- if (hashstr)
|
|
|
c5b8fc |
- free (hashstr);
|
|
|
c5b8fc |
- if (fontdata)
|
|
|
c5b8fc |
- free (fontdata);
|
|
|
c5b8fc |
FcPatternDestroy (pat);
|
|
|
c5b8fc |
bail0:
|
|
|
c5b8fc |
return NULL;
|
|
|
c5b8fc |
--
|
|
|
c5b8fc |
1.8.3.1
|
|
|
c5b8fc |
|