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

Fix embarassing attempt to free a static buffer.

This commit is contained in:
Patrick Lam 2005-09-01 06:59:44 +00:00
parent 2304e38f9b
commit 0230c9f887
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/fccache.c
View File

@ -201,7 +201,6 @@ FcGlobalCacheLoad (FcGlobalCache *cache,
} }
cache->dirs = 0; cache->dirs = 0;
bail0: bail0:
free (current_arch_machine_name);
close (cache->fd); close (cache->fd);
cache->fd = -1; cache->fd = -1;
return; return;
@ -735,11 +734,11 @@ FcDirCacheWrite (FcFontSet *set, FcStrSet *dirs, const FcChar8 *dir)
current_arch_start = FcCacheNextOffset (lseek(fd, 0, SEEK_END)); current_arch_start = FcCacheNextOffset (lseek(fd, 0, SEEK_END));
if (!FcCacheMoveDown(fd, current_arch_start)) if (!FcCacheMoveDown(fd, current_arch_start))
goto bail2; goto bail1;
current_arch_start = lseek(fd, 0, SEEK_CUR); current_arch_start = lseek(fd, 0, SEEK_CUR);
if (ftruncate (fd, current_arch_start) == -1) if (ftruncate (fd, current_arch_start) == -1)
goto bail2; goto bail1;
/* 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)) + metadata.count) - current_arch_start;
@ -767,10 +766,8 @@ FcDirCacheWrite (FcFontSet *set, FcStrSet *dirs, const FcChar8 *dir)
close(fd); close(fd);
return FcTrue; return FcTrue;
bail2:
free (header);
bail1: bail1:
free (current_arch_machine_name); free (header);
bail0: bail0:
free (current_dir_block); free (current_dir_block);
bail: bail: