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

Allocate room for the subdirectory names in each directory cache. Thanks to 

James Cloos for finding and diagnosing this bug!
This commit is contained in:
Patrick Lam 2005-09-27 05:43:08 +00:00
parent 2633bc3843
commit 6aee8c6faa
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/fccache.c
View File

@ -732,7 +732,7 @@ FcBool
FcDirCacheWrite (FcFontSet *set, FcStrSet *dirs, const FcChar8 *dir) FcDirCacheWrite (FcFontSet *set, FcStrSet *dirs, const FcChar8 *dir)
{ {
FcChar8 *cache_file = FcStrPlus (dir, (FcChar8 *) "/" FC_DIR_CACHE_FILE); FcChar8 *cache_file = FcStrPlus (dir, (FcChar8 *) "/" FC_DIR_CACHE_FILE);
int fd, i; int fd, i, dirs_count;
FcCache metadata; FcCache metadata;
off_t current_arch_start = 0, truncate_to; off_t current_arch_start = 0, truncate_to;
@ -773,8 +773,14 @@ FcDirCacheWrite (FcFontSet *set, FcStrSet *dirs, const FcChar8 *dir)
if (ftruncate (fd, current_arch_start) == -1) if (ftruncate (fd, current_arch_start) == -1)
goto bail0; goto bail0;
/* allocate space for subdir names in this block */
dirs_count = 0;
for (i = 0; i < dirs->size; i++)
dirs_count += strlen((char *)dirs->strs[i]) + 1;
dirs_count ++;
/* now write the address of the next offset */ /* now write the address of the next offset */
truncate_to = FcCacheNextOffset (FcCacheNextOffset (current_arch_start + sizeof (FcCache)) + metadata.count) - current_arch_start; truncate_to = FcCacheNextOffset (FcCacheNextOffset (current_arch_start + sizeof (FcCache) + dirs_count) + metadata.count) - current_arch_start;
header = malloc (10 + strlen (current_arch_machine_name)); header = malloc (10 + strlen (current_arch_machine_name));
if (!header) if (!header)
goto bail0; goto bail0;