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

Fix memory leaks reported by Ronny V. Vindenes.

This commit is contained in:
Patrick Lam 2006-01-25 02:33:46 +00:00
parent 986e35979e
commit 6f9fcb5186
3 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2006-01-24 Patrick Lam <plam@mit.edu>
* src/fccache.c (FcDirCacheUnlink, FcDirCacheWrite):
* src/fcfreetype.c (FcFreeTypeQuery):
Fix memory leaks reported by Ronny V. Vindenes.
2006-01-19 Andreas Schwab <schwab@suse.de> 2006-01-19 Andreas Schwab <schwab@suse.de>
reviewed by: plam reviewed by: plam

9
src/fccache.c
View File

@ -658,7 +658,7 @@ FcBool
FcDirCacheUnlink (const FcChar8 *dir, FcConfig *config) FcDirCacheUnlink (const FcChar8 *dir, FcConfig *config)
{ {
char *cache_file; char *cache_file;
char *cache_hashed; char *cache_hashed = 0;
int fd, collisions; int fd, collisions;
struct stat cache_stat; struct stat cache_stat;
char name_buf[FC_MAX_FILE_LEN]; char name_buf[FC_MAX_FILE_LEN];
@ -677,6 +677,9 @@ FcDirCacheUnlink (const FcChar8 *dir, FcConfig *config)
fd = -1; collisions = 0; fd = -1; collisions = 0;
do do
{ {
if (cache_hashed)
FcStrFree ((FcChar8 *)cache_hashed);
cache_hashed = FcDirCacheHashName (cache_file, collisions++); cache_hashed = FcDirCacheHashName (cache_file, collisions++);
if (!cache_hashed) if (!cache_hashed)
goto bail; goto bail;
@ -692,7 +695,10 @@ FcDirCacheUnlink (const FcChar8 *dir, FcConfig *config)
FcCacheReadString (fd, name_buf, sizeof (name_buf)); FcCacheReadString (fd, name_buf, sizeof (name_buf));
if (!strlen(name_buf)) if (!strlen(name_buf))
{
FcStrFree ((FcChar8 *)cache_hashed);
goto bail; goto bail;
}
} while (strcmp (name_buf, cache_file) != 0); } while (strcmp (name_buf, cache_file) != 0);
FcStrFree ((FcChar8 *)cache_file); FcStrFree ((FcChar8 *)cache_file);
@ -1189,6 +1195,7 @@ FcDirCacheWrite (FcFontSet *set, FcStrSet *dirs, const FcChar8 *dir)
if (ftruncate (fd, current_arch_start + truncate_to) == -1) if (ftruncate (fd, current_arch_start + truncate_to) == -1)
goto bail5; goto bail5;
free (header);
close(fd); close(fd);
if (!FcAtomicReplaceOrig(atomic)) if (!FcAtomicReplaceOrig(atomic))
goto bail5; goto bail5;

8
src/fcfreetype.c
View File

@ -1000,6 +1000,7 @@ FcFreeTypeQuery (const FcChar8 *file,
FcChar8 *family = 0; FcChar8 *family = 0;
#endif #endif
FcChar8 *complex; FcChar8 *complex;
FcChar8 *file2;
const FcChar8 *foundry = 0; const FcChar8 *foundry = 0;
int spacing; int spacing;
TT_OS2 *os2; TT_OS2 *os2;
@ -1280,8 +1281,13 @@ FcFreeTypeQuery (const FcChar8 *file,
printf ("Saving unique fullname %s\n", full); printf ("Saving unique fullname %s\n", full);
} }
if (!FcPatternAddString (pat, FC_FILE, (FcChar8 *)basename((char *)FcStrCopy(file)))) file2 = FcStrCopy (file);
if (!FcPatternAddString (pat, FC_FILE, (FcChar8 *)basename((char *)file2)))
{
FcStrFree (file2);
goto bail1; goto bail1;
}
FcStrFree (file2);
FcPatternAddFullFname (pat, (const char *)FcStrCopy (file)); FcPatternAddFullFname (pat, (const char *)FcStrCopy (file));