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

src/fccache.c (FcDirCacheProduce) 

Fix case where alignment bytes bumped up metadata->count causing
    unwarranted failures to write cache files. (Reported by Stephan Kulow).
This commit is contained in:
Patrick Lam 2005-11-16 17:49:01 +00:00
parent 7fd7221e68
commit 8e351527bb
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2005-11-16 Patrick Lam <plam@mit.edu>
* src/fccache.c (FcDirCacheProduce)
Fix case where alignment bytes bumped up metadata->count
causing unwarranted failures to write cache files.
(Reported by Stephan Kulow).
2005-11-16 Patrick Lam <plam@mit.edu> 2005-11-16 Patrick Lam <plam@mit.edu>
* src/fccache.c (FcDirCacheProduce): * src/fccache.c (FcDirCacheProduce):
* src/fccharset.c (FcCharSetDistributeBytes): * src/fccharset.c (FcCharSetDistributeBytes):

15
src/fccache.c
View File

@ -793,7 +793,7 @@ FcDirCacheProduce (FcFontSet *set, FcCache *metadata)
{ {
void * current_dir_block, * final_dir_block; void * current_dir_block, * final_dir_block;
static unsigned int rand_state = 0; static unsigned int rand_state = 0;
int bank; int bank, needed_bytes_no_align;
if (!rand_state) if (!rand_state)
rand_state = time(0L); rand_state = time(0L);
@ -804,20 +804,27 @@ FcDirCacheProduce (FcFontSet *set, FcCache *metadata)
memset (metadata, 0, sizeof(FcCache)); memset (metadata, 0, sizeof(FcCache));
FcFontSetNewBank(); FcFontSetNewBank();
metadata->count = FcFontSetNeededBytes (set) + needed_bytes_no_align = FcFontSetNeededBytes (set);
metadata->count = needed_bytes_no_align +
FcFontSetNeededBytesAlign (); FcFontSetNeededBytesAlign ();
metadata->magic = FC_CACHE_MAGIC; metadata->magic = FC_CACHE_MAGIC;
metadata->bank = bank; metadata->bank = bank;
if (!metadata->count) /* not a failure, no fonts to write */ if (!needed_bytes_no_align) /* not a failure, no fonts to write */
{
/* no, you don't really need to write any bytes at all. */
metadata->count = 0;
return 0; return 0;
}
current_dir_block = malloc (metadata->count); current_dir_block = malloc (metadata->count);
if (!current_dir_block) if (!current_dir_block)
goto bail; goto bail;
// shut up valgrind
memset (current_dir_block, 0, metadata->count);
final_dir_block = FcFontSetDistributeBytes (metadata, current_dir_block); final_dir_block = FcFontSetDistributeBytes (metadata, current_dir_block);
if ((char *)current_dir_block + metadata->count != final_dir_block) if ((void *)((char *)current_dir_block+metadata->count) < final_dir_block)
goto bail; goto bail;
if (!FcFontSetSerialize (bank, set)) if (!FcFontSetSerialize (bank, set))