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

Bug 90867 - Memory Leak during error case in fccharset 

https://bugs.freedesktop.org/show_bug.cgi?id=90867
This commit is contained in:
Akira TAGOH 2015-06-24 15:46:45 +09:00
parent 0551e1b344
commit a8096dfa59
1 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/fccharset.c
View File

@ -164,6 +164,14 @@ FcCharSetPutLeaf (FcCharSet *fcs,
unsigned int alloced = 8; unsigned int alloced = 8;
leaves = malloc (alloced * sizeof (*leaves)); leaves = malloc (alloced * sizeof (*leaves));
numbers = malloc (alloced * sizeof (*numbers)); numbers = malloc (alloced * sizeof (*numbers));
if (!leaves || !numbers)
{
if (leaves)
free (leaves);
if (numbers)
free (numbers);
return FcFalse;
}
} }
else else
{ {
@ -172,8 +180,19 @@ FcCharSetPutLeaf (FcCharSet *fcs,
alloced *= 2; alloced *= 2;
new_leaves = realloc (leaves, alloced * sizeof (*leaves)); new_leaves = realloc (leaves, alloced * sizeof (*leaves));
if (!new_leaves)
return FcFalse;
numbers = realloc (numbers, alloced * sizeof (*numbers)); numbers = realloc (numbers, alloced * sizeof (*numbers));
if (!numbers)
{
/* Revert the reallocation of leaves */
leaves = realloc (new_leaves, (alloced / 2) * sizeof (*new_leaves));
/* unlikely to fail though */
if (!leaves)
return FcFalse;
fcs->leaves_offset = FcPtrToOffset (fcs, leaves);
return FcFalse;
}
distance = (intptr_t) new_leaves - (intptr_t) leaves; distance = (intptr_t) new_leaves - (intptr_t) leaves;
if (new_leaves && distance) if (new_leaves && distance)
{ {
@ -184,9 +203,6 @@ FcCharSetPutLeaf (FcCharSet *fcs,
leaves = new_leaves; leaves = new_leaves;
} }
if (!leaves || !numbers)
return FcFalse;
fcs->leaves_offset = FcPtrToOffset (fcs, leaves); fcs->leaves_offset = FcPtrToOffset (fcs, leaves);
fcs->numbers_offset = FcPtrToOffset (fcs, numbers); fcs->numbers_offset = FcPtrToOffset (fcs, numbers);
} }