* src/cff/cffload.c (cff_index_get_pointers): Rename `t' to `tbl'.
This commit is contained in:
parent
c8cd139c30
commit
74cebeae12
|
@ -1,3 +1,7 @@
|
||||||
|
2020-06-19 Werner Lemberg <wl@gnu.org>
|
||||||
|
|
||||||
|
* src/cff/cffload.c (cff_index_get_pointers): Rename `t' to `tbl'.
|
||||||
|
|
||||||
2020-06-19 Sebastian Rasmussen <sebras@gmail.com>
|
2020-06-19 Sebastian Rasmussen <sebras@gmail.com>
|
||||||
|
|
||||||
[cff] Free table upon error allocating other data (#58609).
|
[cff] Free table upon error allocating other data (#58609).
|
||||||
|
|
|
@ -410,7 +410,7 @@
|
||||||
FT_Error error = FT_Err_Ok;
|
FT_Error error = FT_Err_Ok;
|
||||||
FT_Memory memory = idx->stream->memory;
|
FT_Memory memory = idx->stream->memory;
|
||||||
|
|
||||||
FT_Byte** t = NULL;
|
FT_Byte** tbl = NULL;
|
||||||
FT_Byte* new_bytes = NULL;
|
FT_Byte* new_bytes = NULL;
|
||||||
FT_ULong new_size;
|
FT_ULong new_size;
|
||||||
|
|
||||||
|
@ -427,11 +427,11 @@
|
||||||
new_size = idx->data_size + idx->count;
|
new_size = idx->data_size + idx->count;
|
||||||
|
|
||||||
if ( idx->count > 0 &&
|
if ( idx->count > 0 &&
|
||||||
!FT_NEW_ARRAY( t, idx->count + 1 ) &&
|
!FT_NEW_ARRAY( tbl, idx->count + 1 ) &&
|
||||||
( !pool || !FT_ALLOC( new_bytes, new_size ) ) )
|
( !pool || !FT_ALLOC( new_bytes, new_size ) ) )
|
||||||
{
|
{
|
||||||
FT_ULong n, cur_offset;
|
FT_ULong n, cur_offset;
|
||||||
FT_ULong extra = 0;
|
FT_ULong extra = 0;
|
||||||
FT_Byte* org_bytes = idx->bytes;
|
FT_Byte* org_bytes = idx->bytes;
|
||||||
|
|
||||||
|
|
||||||
|
@ -448,9 +448,9 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( !pool )
|
if ( !pool )
|
||||||
t[0] = org_bytes + cur_offset;
|
tbl[0] = org_bytes + cur_offset;
|
||||||
else
|
else
|
||||||
t[0] = new_bytes + cur_offset;
|
tbl[0] = new_bytes + cur_offset;
|
||||||
|
|
||||||
for ( n = 1; n <= idx->count; n++ )
|
for ( n = 1; n <= idx->count; n++ )
|
||||||
{
|
{
|
||||||
|
@ -464,23 +464,25 @@
|
||||||
next_offset = idx->data_size;
|
next_offset = idx->data_size;
|
||||||
|
|
||||||
if ( !pool )
|
if ( !pool )
|
||||||
t[n] = org_bytes + next_offset;
|
tbl[n] = org_bytes + next_offset;
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
t[n] = new_bytes + next_offset + extra;
|
tbl[n] = new_bytes + next_offset + extra;
|
||||||
|
|
||||||
if ( next_offset != cur_offset )
|
if ( next_offset != cur_offset )
|
||||||
{
|
{
|
||||||
FT_MEM_COPY( t[n - 1], org_bytes + cur_offset, t[n] - t[n - 1] );
|
FT_MEM_COPY( tbl[n - 1],
|
||||||
t[n][0] = '\0';
|
org_bytes + cur_offset,
|
||||||
t[n] += 1;
|
tbl[n] - tbl[n - 1] );
|
||||||
|
tbl[n][0] = '\0';
|
||||||
|
tbl[n] += 1;
|
||||||
extra++;
|
extra++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
cur_offset = next_offset;
|
cur_offset = next_offset;
|
||||||
}
|
}
|
||||||
*table = t;
|
*table = tbl;
|
||||||
|
|
||||||
if ( pool )
|
if ( pool )
|
||||||
*pool = new_bytes;
|
*pool = new_bytes;
|
||||||
|
@ -491,8 +493,9 @@
|
||||||
Exit:
|
Exit:
|
||||||
if ( error && new_bytes )
|
if ( error && new_bytes )
|
||||||
FT_FREE( new_bytes );
|
FT_FREE( new_bytes );
|
||||||
if ( error && t )
|
if ( error && tbl )
|
||||||
FT_FREE( t );
|
FT_FREE( tbl );
|
||||||
|
|
||||||
return error;
|
return error;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue